summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild')
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild19
1 files changed, 12 insertions, 7 deletions
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
index dd1810a5fe1a..020e26fc0ec0 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0/${PV:2:4}.$(ver_cut 2).0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
+IUSE="test test-helpers"
RDEPEND="
- test? (
+ test-helpers? (
dev-cpp/gtest:=[${MULTILIB_USEDEP}]
)
"
@@ -45,6 +45,7 @@ src_prepare() {
use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
# un-hardcode abseil compiler flags
+ # 942192
sed -i \
-e '/"-maes",/d' \
-e '/"-msse4.1",/d' \
@@ -63,14 +64,18 @@ multilib_src_configure() {
# We use -std=c++14 here so that abseil-cpp's string_view is used
# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
-DCMAKE_CXX_STANDARD=14
- -DABSL_ENABLE_INSTALL=TRUE
- -DABSL_USE_EXTERNAL_GOOGLETEST=ON
- -DABSL_PROPAGATE_CXX_STD=TRUE
+
+ -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)"
+ -DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)"
+
-DABSL_BUILD_TESTING="$(usex test)"
)
- # intentional use, it uses both variables for tests.
+ # intentional use, it requires both variables for tests.
+ # (BUILD_TESTING AND ABSL_BUILD_TESTING)
if use test; then
mycmakeargs+=(
-DBUILD_TESTING="yes"