diff options
Diffstat (limited to 'dev-cpp/abseil-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild | 4 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch | 49 |
3 files changed, 55 insertions, 1 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 7f24b5e225a4..81068ff370f7 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -4,6 +4,7 @@ AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2138 BLAKE2B c52ca02f2cdfe8a AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0edbcfcb4d4c7552e591d43742f399e6939b8dbf80c8c40e8ba46076265a374dd3d889a77ba9ab4ce747803aa031fe631898d9d90f3a6a30fb88023 SHA512 a4924d9e95c1ec8c1f31a1ead48063a7a6d6295bfa4dbe6ad3902c459e23973e75ec961eeb4ba6c17518cf48d7edeff315e65d0f5c6d3d6f07154127f370977b AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53 AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867 +AUX abseil-cpp-20230125.2-musl-1.2.4.patch 2203 BLAKE2B 74ebf85e5f35de255fbf5a757655fedd8f5821558ecf700fcc06e30950ce4bb802ca2431cf8b15d05ddc3a7bf2818eec49bf38c2e33d033df0c2973983340ed4 SHA512 404a3c25135573292cbe90f3fb459172a936abc2ec4739e57b8a1dac300a3e0b848ba18aaab5f6dfd12315de736175b962174022a7969149221bf595738bebb1 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2 @@ -15,5 +16,5 @@ DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb EBUILD abseil-cpp-20200923.3.ebuild 2043 BLAKE2B 3d2f25eb4c3afe3d7fa8a396820be113fe4bd55c42da6e2e1c417d8836767b560eff3397c4bd04310b244d267501d8a4da92898c2f2cf9dd9df36b35f56f7faf SHA512 04831976c69d3e61836c0dadf8c3b10f127ed7bd5567b33c1dbe96b10ee332de60333ccef7455e56f9e91202f3294bef3a3097294c8a43670f7c8e4055649199 EBUILD abseil-cpp-20211102.0-r2.ebuild 1812 BLAKE2B 3e8b5486a5b9817c089cae614e17c7f095d5b4067af9c9da5fb98eeba772b41f154312f67789391a72267f3a2fa7a1062623b312bbf9b391c8b79069d20af853 SHA512 be4eae4177d0817871aee1a4b43d91f766e8186b26e8cda153c04e5894c3943764d86440f09a6177ead172c73706cd68f4be4c61b0e612ad3fbd6ce08ffcf1b5 EBUILD abseil-cpp-20220623.1.ebuild 1662 BLAKE2B cd104aa4542cc5c1bfa6b9741aea37ea3c263d06733a08e1d05fd9cd0ce90e5f39ac041b4bea089bfa4f0b4f54d949fa6b7dc417891d600e66e318630a164314 SHA512 672ad7ca48f8f8148888144b4fd1972ba828cd2ded92a359bb180b6864bcc63e2767833cc351fa4df350b098c18cd1a6024c332829e5b2ee31c856034c175af4 -EBUILD abseil-cpp-20230125.2.ebuild 1604 BLAKE2B 0cb21bceea0282c789e16ba36ec1e0062d7c00e49c6aa259fe02e76a7995658f2e9c8ae88b745d68f9f407bcb936534f8e21504a00b4de6ca6c22d90992dcc6a SHA512 5d94d9e352820cdc552e99d4094abd4b1ffe351d26b86799c1021dca4ca3bb5a864d97b06d26be19f231142eb3202544e47557268012c167ae07da379b2e87f5 +EBUILD abseil-cpp-20230125.2.ebuild 1674 BLAKE2B 58963212a80615b21d8b90e29a7797035bcfae6835f1b51f29a74d2619ad2bb2806c7adc6d35d4dc74f6fcaf783a24100d1d610ee3d3663f0e3a8d6f9a9c088b SHA512 30d3d7c5b05317cc9527114e5d289f1bd15dc1119691b60ca3d36672dd0e47758797f3ba662d7c7d79fb5b23b53bc72b33475cb6a8d14d446e5307762653864a MISC metadata.xml 439 BLAKE2B c4a87701635b1b903c2461acca126d15edb4f15cbb8dd9f353bcc71730c85478fd815e1f9c1f6ff8082360777a6e11042a01e417167c192b41f72b67e193d41f SHA512 16489f072408026da8f5da445185233f54a7c29761fa835a8388099acb8a6e3685e7db108fc4a3daa3430bcf6cb61d2e5d03c2e0e25d0f42f6da23e5dbcd134e diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild index 067f0d0a0876..f80007d0052b 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild @@ -31,6 +31,10 @@ BDEPEND=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 +) + src_prepare() { cmake_src_prepare diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch new file mode 100644 index 000000000000..e4834250cfc9 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/906218 +https://github.com/abseil/abseil-cpp/issues/1473 +https://github.com/abseil/abseil-cpp/commit/4500c2fada4e952037c59bd65e8be1ba0b29f21e + +From 4500c2fada4e952037c59bd65e8be1ba0b29f21e Mon Sep 17 00:00:00 2001 +From: Derek Mauro <dmauro@google.com> +Date: Mon, 12 Jun 2023 08:11:36 -0700 +Subject: [PATCH] DirectMmap: Use off_t instead of off64_t for the offset + parameter + +off_t is best for portability. Its size varies with the platform. +off64_t is non-standard, but is present in glibc and some BSDs. +It also matches the signature specified in the manual. +https://man7.org/linux/man-pages/man2/mmap.2.html + +This is a re-spin of #1349, but correctly casts the type to the type +expected by the kernel for mmap2. +https://man7.org/linux/man-pages/man2/mmap2.2.html + +Fixes #1473 + +PiperOrigin-RevId: 539656313 +Change-Id: I7a30dd9d3eb6af03a99da0d93d721a86f6521b25 +--- + absl/base/internal/direct_mmap.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h +index 815b8d23ba3..1beb2ee4e52 100644 +--- a/absl/base/internal/direct_mmap.h ++++ b/absl/base/internal/direct_mmap.h +@@ -72,7 +72,7 @@ namespace base_internal { + // Platform specific logic extracted from + // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h + inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, +- off64_t offset) noexcept { ++ off_t offset) noexcept { + #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ + defined(__m68k__) || defined(__sh__) || \ + (defined(__hppa__) && !defined(__LP64__)) || \ +@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, + #else + return reinterpret_cast<void*>( + syscall(SYS_mmap2, start, length, prot, flags, fd, +- static_cast<off_t>(offset / pagesize))); ++ static_cast<unsigned long>(offset / pagesize))); // NOLINT + #endif + #elif defined(__s390x__) + // On s390x, mmap() arguments are passed in memory. |