From 5f43906f201dd78a79a9ced9aa8d19a4de5792fe Mon Sep 17 00:00:00 2001 From: Paul Zander Date: Sun, 20 Jul 2025 20:30:15 +0200 Subject: dev-cpp/abseil-cpp: add dep on gtest for USE=test Closes: https://bugs.gentoo.org/956667 Signed-off-by: Paul Zander Part-of: https://github.com/gentoo/gentoo/pull/43085 Signed-off-by: Sam James --- dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild | 3 + dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild | 3 + dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild | 3 + dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.ebuild | 102 +++++++++++++++++++++ dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild | 99 -------------------- 5 files changed, 111 insertions(+), 99 deletions(-) create mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.ebuild delete mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild (limited to 'dev-cpp/abseil-cpp') diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild index 420b0a925935..8fffaba1bbb5 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}] ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild index 481480e5aadd..89583d7032e8 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}] ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild index 0600c3d0a9a9..2ae9c60bc5d6 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild @@ -21,6 +21,9 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~spar 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.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.ebuild new file mode 100644 index 000000000000..3085645883b6 --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250512.0-r1.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_{10..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/abseil-cpp-20250512.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild deleted file mode 100644 index 622f80f0ff77..000000000000 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250512.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2020-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..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-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 -} -- cgit v1.2.3