diff options
Diffstat (limited to 'dev-cpp/abseil-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 1 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild | 1 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild | 1 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild) | 3 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20250512.1.ebuild | 102 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch | 37 |
9 files changed, 116 insertions, 43 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index b7790a2a1c56..2fa13a62bee7 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -12,6 +12,7 @@ DIST abseil-cpp-20250127.0-PR1834.patch 968 BLAKE2B b563725afcae9fcbddde9aef1e49 DIST abseil-cpp-20250127.0.tar.gz 2267275 BLAKE2B 70fa05a0db91b9e7ccf9f2828a7bf4b7fe6d7177b5f2d17b2f2f6f2a5e83289674d624fa7983410713a2d62b1025a5b5d957f1ba11e01cb727fc771ce76bc914 SHA512 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd DIST abseil-cpp-20250127.1.tar.gz 2267282 BLAKE2B 61a6f0340c3883f097c56161d67f0046398513ef716d33a7b26e55e33032262f2e5f02c678318688f7f72a5eea7a88b37abf6d2f84e52626a258c497bea80a83 SHA512 8312acf0ed74fa28c6397f3e41ada656dbd5ca2bf8db484319d74b144ad19c0ebdc77f7f03436be6c6ca1cde706b9055079233cf0d6b5ada4ca48406f8a55dd8 DIST abseil-cpp-20250512.0.tar.gz 2221435 BLAKE2B dc3c6e4b309d28968399b5d6222c9d135735d6918f1c6f907945fe8db824f5847d932778184bdf4f14e233e79a752616e7dff40d4c21c5303d7fed66a810c064 SHA512 92542db666e0c628cf56bf8ad09412af9c8b622e4f26e72d1e1b092ceec430a5c105f6561e2d9983af565f55da07f67e770cafe373b20cc4cb29a893a6a236fc +DIST abseil-cpp-20250512.1.tar.gz 2221441 BLAKE2B f84faffcc606b0e4ece3cd8494e6727d74faf74c2900928c317dbce1393a4e3095ecdea4529311323b99459879957841a7300fed0499eba28fc9d764c9ddca40 SHA512 d3ba654ed7dd7b432494918b2de5d8e2b0ad1c42752c5d726f20d6fe2841828fb4e8beb853e3570a11efecef725029ce5ffa3ebc434efff007e7f60735eb9856 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild index 985188a6f1f1..f614dec5c2e5 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild @@ -36,7 +36,6 @@ PATCHES=( "${FILESDIR}/${PN}-random-tests.patch" #935417 "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 "${FILESDIR}/${PN}-include-cstdint.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild index b92b742efd97..b084dcb08bd5 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild @@ -36,7 +36,6 @@ PATCHES=( "${FILESDIR}/${PN}-random-tests.patch" #935417 "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 "${FILESDIR}/${PN}-include-cstdint.patch" #937307 - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild index afc5d0e60832..ab5075af7730 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild @@ -17,6 +17,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 IUSE="test test-helpers" RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) test-helpers? ( dev-cpp/gtest:=[${MULTILIB_USEDEP}] ) @@ -35,7 +38,6 @@ PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-include-cstdint.patch" #937307 "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild index d9a247d58562..becc0afc0142 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild @@ -21,6 +21,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 IUSE="test test-helpers" RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) test-helpers? ( dev-cpp/gtest:=[${MULTILIB_USEDEP}] ) @@ -38,7 +41,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" "${DISTDIR}/${PN}-20250127.0-PR1834.patch" ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild index cfb9660e68b5..dc374676d571 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild @@ -17,10 +17,13 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0/${PV:2:4}.$(ver_cut 2).0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="test test-helpers" RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) test-helpers? ( dev-cpp/gtest:=[${MULTILIB_USEDEP}] ) @@ -38,7 +41,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" "${DISTDIR}/${PN}-20250127.0-PR1834.patch" ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.ebuild index 3db3bdde4d90..8f3d419b4bc0 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.ebuild @@ -19,6 +19,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 IUSE="test test-helpers" RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) test-helpers? ( dev-cpp/gtest:=[${MULTILIB_USEDEP}] ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250512.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250512.1.ebuild new file mode 100644 index 000000000000..46471598f80e --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250512.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12,13} ) + +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" +HOMEPAGE="https://abseil.io/" +SRC_URI=" + https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0/${PV:2:4}.$(ver_cut 2).0" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="test test-helpers" + +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) + test-helpers? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" + "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" +) + +src_prepare() { + cmake_src_prepare + + use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" + + # un-hardcode abseil compiler flags + # 942192 + sed -i \ + -e '/NOMINMAX/d' \ + absl/copts/copts.py || die + + # now generate cmake files + python_fix_shebang absl/copts/generate_copts.py + absl/copts/generate_copts.py || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DABSL_ENABLE_INSTALL="yes" + -DABSL_USE_EXTERNAL_GOOGLETEST="yes" + -DABSL_PROPAGATE_CXX_STD="yes" + + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)" + + -DABSL_BUILD_TESTING="$(usex test)" + ) + # intentional use, it requires both variables for tests. + # (BUILD_TESTING AND ABSL_BUILD_TESTING) + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi + + cmake_src_configure +} + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + else + if ! multilib_is_native_abi; then + CMAKE_SKIP_TESTS+=( + absl_hash_instantiated_test + ) + fi + fi + + cmake_src_test +} diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch deleted file mode 100644 index 8cc39ee9fc58..000000000000 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6be17375f9142017d34bd0b577cdf4e91225c135 Mon Sep 17 00:00:00 2001 -From: Paul Zander <negril.nx+gentoo@gmail.com> -Date: Fri, 22 Nov 2024 19:46:05 +0100 -Subject: [PATCH] don't include <ciso646> with c++17 - -[179/825] Building CXX object absl/log/CMakeFiles/log_globals.dir/globals.cc.o -In file included from -/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/internal/hash.h:33, -from -/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/hash.h:85, -from -/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/log/globals.cc:29: -/usr/lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/ciso646:46:4: warning: -#warning "<ciso646> is deprecated in C++17, use <version> to detect -implementation-specific macros" [-Wcpp] -46 | # warning "<ciso646> is deprecated in C++17, use <version> to detect -implementation-specific macros" - | ^~~~~~~ - -Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> - -diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h -index 03bf183..3222be3 100644 ---- a/absl/hash/internal/hash.h -+++ b/absl/hash/internal/hash.h -@@ -27,7 +27,7 @@ - #include "absl/base/config.h" - - // For feature testing and determining which headers can be included. --#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L -+#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L - #include <version> - #else - #include <ciso646> --- -2.47.0 - |