commit: dc9def88168bb1d982c9f3eb6441468e4fdd7b37 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 21 18:06:05 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 21 18:21:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9def88
dev-cpp/abseil-cpp: backport -std=c++14 Backport 6ad1e6f5375e93ff6c9053392852ed4ae0eac7c4. Signed-off-by: Sam James <sam <AT> gentoo.org> ...abseil-cpp-20230125.3.ebuild => abseil-cpp-20230125.3-r1.ebuild} | 6 ++++-- 1 file 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 similarity index 87% rename from dev-cpp/abseil-cpp/abseil-cpp-20230125.3.ebuild rename to 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
