summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-08-21 19:06:05 +0100
committerSam James <sam@gentoo.org>2023-08-21 19:21:59 +0100
commitdc9def88168bb1d982c9f3eb6441468e4fdd7b37 (patch)
tree3ff5ee0020b64d777603d50a21f57eb7ca48d77c /dev-cpp/abseil-cpp
parentdev-python/protobuf-python: sync live (diff)
downloadgentoo-dc9def88168bb1d982c9f3eb6441468e4fdd7b37.tar.gz
gentoo-dc9def88168bb1d982c9f3eb6441468e4fdd7b37.tar.bz2
gentoo-dc9def88168bb1d982c9f3eb6441468e4fdd7b37.zip
dev-cpp/abseil-cpp: backport -std=c++14
Backport 6ad1e6f5375e93ff6c9053392852ed4ae0eac7c4. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-cpp/abseil-cpp')
-rw-r--r--dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20230125.3.ebuild)6
1 files changed, 4 insertions, 2 deletions
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild
index 6314e6d2977e..3ab7ae818f50 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r1.ebuild
@@ -12,7 +12,7 @@ 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%%.*}"
+SLOT="0/${PV%%.*}.0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="test"
@@ -51,7 +51,9 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=17
+ # 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