diff options
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/Manifest.gz | bin | 37134 -> 37126 bytes | |||
| -rw-r--r-- | dev-ml/core_unix/Manifest | 3 | ||||
| -rw-r--r-- | dev-ml/core_unix/core_unix-0.15.2-r1.ebuild | 13 | ||||
| -rw-r--r-- | dev-ml/core_unix/files/core_unix-0.15.2-musl.patch | 11 |
4 files changed, 25 insertions, 2 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz Binary files differindex d19f75b91cc1..d3df459513e5 100644 --- a/dev-ml/Manifest.gz +++ b/dev-ml/Manifest.gz diff --git a/dev-ml/core_unix/Manifest b/dev-ml/core_unix/Manifest index f4ca664572f3..0bb51a613f69 100644 --- a/dev-ml/core_unix/Manifest +++ b/dev-ml/core_unix/Manifest @@ -1,5 +1,6 @@ +AUX core_unix-0.15.2-musl.patch 531 BLAKE2B 4099aae8650bce471620a8a86fcbbbfa64bb77befafb3f6bb505deb564f1e0dd74dc6e9dee5dc580a524b3f5a0409eaf9f3f6bf461aaf5e5575d93bf36d3789f SHA512 3d9d5c3aed77931b2ce20ba768e56f369c816a4bb3adf922e7c428572d9a5fdadc8a19b8eb01c58f8cf932ec158c99f52c10f58bfa6cfc67abd3fc5178eaacff DIST core_unix-0.15.0.tar.gz 377928 BLAKE2B 49b58471a28c356bdf39f15e22bd21ec4363182cf744c0455847ffc15015fdad2928a428986c2a9edff647ebef9f2ad2059b184b393e979119c8f007f67ec140 SHA512 eeb53bd0c06a7d1facfb133f0a45a232d57941eff644d4ed6c2d5002acd4e6b323376ec9c05838f760ebd9da3fbc39332989ed50b3921191c175811c947fcbfe DIST core_unix-0.15.2.tar.gz 377836 BLAKE2B 56551ab1509bfecc59ae4b45aaaa4d336415cffe9339932239c884bc86207bdb4066aace35144618509b78b461164bdfaaaa04030ecb1b3619de6f8fe5c3a7b9 SHA512 6d59c52111235f952f3052fb86af1d7380ff3d8d89b5c8d59a66d530a14d462fa4b06cdf29f2ee2b4356a574dbefef33b82f60f9fba512942bc0e6aad07f2b6f EBUILD core_unix-0.15.0.ebuild 577 BLAKE2B 1fd5f1ae602502ef50267d88f5788a66388153082066863e191115b58154059d577e079dca5818982133812070909249a548ca205912ba38c184278c8a5498dc SHA512 318fb4a1c646219119c85d42205986de3745b3755031db4d2baf3f3f8bf59cfe57991a167fd14fe88e8b62b5d91f02e62ba47ecd2aaf4d0ea81439ea855f1f9f -EBUILD core_unix-0.15.2-r1.ebuild 632 BLAKE2B 10f8ad0f73ef50f0055e2e7cd441623cadd9fac7f65e32182ffa8ee6692dd2be6606504dc411de15ca5f750731f101c3a8fddf2a6061a42111fe0b6e36ebbedb SHA512 4ea36fc451f058775e922e355400060752319a86f08deff268aef01524558ef8a3cefc3e8b62c6f737b4ac6c3b1cfddff8ef45f442d133f8f98a08c7b8161031 +EBUILD core_unix-0.15.2-r1.ebuild 808 BLAKE2B f25d7c9e3f66b9ba99e72158bc988e2b4652ea0eeaf4406969fef841f865f1ed7bd850c7ce72bf648219510afce17cac682f2ab48330fa6adf97a31e2d65a30d SHA512 22a911c58be6de39f36a25f031ba5920a906c2e97f984677c61f52d29d1cd3ae7bffc1b7318553a9a45606e1cccbceafdeff06d68cf646dc63a90f0101be0940 MISC metadata.xml 318 BLAKE2B 2179bfab915d936189f80d0c10ee6367fe5ad711df66647da644fa05d8b1b9778d83d2862228955fc11621368a523fa904b639c47a4d8843b42e561127f94baf SHA512 66ae67f04d4f63ed5940c7164f0bfb27097e066c30d07a01c3d773b8b40a7ff6c8f0632e1103b952d310120cc0111690b93495fd0ac6c582652c627006e24bae diff --git a/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild index c543a96d0275..ae132f20399d 100644 --- a/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild +++ b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit dune +inherit dune toolchain-funcs DESCRIPTION="Unix-specific portions of Core" HOMEPAGE="https://github.com/janestreet/core_unix" @@ -25,3 +25,14 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND="" + +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + +src_prepare() { + sed -i \ + -e "s:gcc:$(tc-getCC):" \ + unix_pseudo_terminal/src/discover.sh \ + || die + + default +} diff --git a/dev-ml/core_unix/files/core_unix-0.15.2-musl.patch b/dev-ml/core_unix/files/core_unix-0.15.2-musl.patch new file mode 100644 index 000000000000..fb1101426ba2 --- /dev/null +++ b/dev-ml/core_unix/files/core_unix-0.15.2-musl.patch @@ -0,0 +1,11 @@ +--- a/bigstring_unix/src/bigstring_unix_stubs.c 2023-04-20 21:13:23.374157594 +0200 ++++ b/bigstring_unix/src/bigstring_unix_stubs.c 2023-04-20 21:13:32.900011808 +0200 +@@ -699,7 +699,7 @@ + int count = Int_val(v_count); + size_t total_len = 0; + struct iovec *iovecs = copy_iovecs(&total_len, v_iovecs, count); +- struct msghdr msghdr = { NULL, 0, NULL, 0, NULL, 0, 0 }; ++ struct msghdr msghdr = { NULL }; + ssize_t ret; + if (total_len > THREAD_IO_CUTOFF || contains_mmapped(v_iovecs, count)) { + Begin_roots1(v_iovecs); |