commit: 99e8c24380bb00f90ed98cc36e0451e245d1e8f4 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sun Jun 11 16:13:07 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 21 17:30:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e8c243
dev-cpp/abseil-cpp: add multilib support Needed by protobuf. Closes: https://bugs.gentoo.org/908372 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild | 5 +++-- dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild index f80007d0052b..a2402a45796c 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake python-any-r1 +inherit cmake-multilib python-any-r1 # yes, it needs SOURCE, not just installed one GTEST_COMMIT="v1.13.0" @@ -56,7 +56,7 @@ src_prepare() { fi } -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DCMAKE_CXX_STANDARD=17 -DABSL_ENABLE_INSTALL=TRUE @@ -65,5 +65,6 @@ src_configure() { -DABSL_BUILD_TESTING=$(usex test ON OFF) $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests. ) + cmake_src_configure } diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild index 10dd19ada8e9..b5d25058e213 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-any-r1 +inherit cmake-multilib python-any-r1 DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" HOMEPAGE="https://abseil.io/"; @@ -45,7 +45,7 @@ src_prepare() { absl/copts/generate_copts.py || die } -src_configure() { +multilib_src_configure() { local mycmakeargs=( # 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.
