commit: 53bb853b51f0ccdacba1714a9405e23fbdd96ce2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 13 01:53:21 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 13 01:53:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53bb853b
dev-cpp/abseil-cpp: unconditionally install test helper libraries dev-libs/protobuf needs it at least and depending on USE=test for it is considered odd. Bug: https://bugs.gentoo.org/915902 Bug: https://bugs.gentoo.org/934062 Signed-off-by: Sam James <sam <AT> gentoo.org> ...seil-cpp-20230125.3-r1.ebuild => abseil-cpp-20230125.3-r2.ebuild} | 5 +++-- ...{abseil-cpp-20230802.0.ebuild => abseil-cpp-20230802.0-r1.ebuild} | 5 +++-- ...{abseil-cpp-20240116.2.ebuild => abseil-cpp-20240116.2-r1.ebuild} | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild similarity index 92% rename from dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild rename to dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild index 3ab7ae818f50..a1f813ccd43b 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -57,7 +57,8 @@ multilib_src_configure() { -DABSL_ENABLE_INSTALL=TRUE -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE - -DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF) + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON -DABSL_BUILD_TESTING=$(usex test ON OFF) $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild similarity index 92% rename from dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild rename to dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild index 8efabfde0a90..812cf4bb324a 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,7 +54,8 @@ multilib_src_configure() { -DABSL_ENABLE_INSTALL=TRUE -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE - -DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF) + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON -DABSL_BUILD_TESTING=$(usex test ON OFF) $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild similarity index 94% rename from dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild rename to dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild index ae4c74260b71..6241785276e6 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild @@ -51,7 +51,8 @@ multilib_src_configure() { -DABSL_ENABLE_INSTALL=TRUE -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE - -DABSL_BUILD_TEST_HELPERS=$(usex test ON OFF) + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON -DABSL_BUILD_TESTING=$(usex test ON OFF) $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. )
