Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 908372 - dev-cpp/abseil-cpp: add multilib support
Summary: dev-cpp/abseil-cpp: add multilib support
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Georgy Yakovlev
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2023-06-11 10:45 UTC by Stephan Hartmann (RETIRED)
Modified: 2023-08-21 17:31 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Stephan Hartmann (RETIRED) gentoo-dev 2023-06-11 10:45:17 UTC
Upcoming dev-libs/re2 depends on abseil, but re2 has multilib support.
Comment 1 Stephan Hartmann (RETIRED) gentoo-dev 2023-06-11 12:48:00 UTC
This seems to work:
--- 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,13 +56,17 @@ src_prepare() {
 }

 src_configure() {
-       local mycmakeargs=(
-               -DCMAKE_CXX_STANDARD=17
-               -DABSL_ENABLE_INSTALL=TRUE
-               -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT#v}"
-               -DABSL_PROPAGATE_CXX_STD=TRUE
-               -DABSL_BUILD_TESTING=$(usex test ON OFF)
-               $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests.
-       )
-       cmake_src_configure
+       abi_configure() {
+               local mycmakeargs=(
+                       -DCMAKE_CXX_STANDARD=17
+                       -DABSL_ENABLE_INSTALL=TRUE
+                       -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT#v}"
+                       -DABSL_PROPAGATE_CXX_STD=TRUE
+                       -DABSL_BUILD_TESTING=$(usex test ON OFF)
+                       $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests.
+               )
+               cmake_src_configure
+       }
+
+       multilib_parallel_foreach_abi abi_configure
 }
Comment 2 Holger Hoffstätte 2023-08-14 16:55:24 UTC
See also: https://github.com/gentoo/gentoo/pull/32281
Comment 3 Larry the Git Cow gentoo-dev 2023-08-21 17:31:13 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e8c24380bb00f90ed98cc36e0451e245d1e8f4

commit 99e8c24380bb00f90ed98cc36e0451e245d1e8f4
Author:     Stephan Hartmann <sultan@gentoo.org>
AuthorDate: 2023-06-11 16:13:07 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2023-08-21 17:30:08 +0000

    dev-cpp/abseil-cpp: add multilib support
    
    Needed by protobuf.
    
    Closes: https://bugs.gentoo.org/908372
    Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
    Signed-off-by: Sam James <sam@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(-)