commit: 9459a5f07b31fb170b09a4f3aa828178cde9ea8c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 18:51:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 18:51:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9459a5f0
dev-util/bloaty: protobuf now needs >=c++14
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/bloaty/bloaty-1.1.ebuild | 3 +++
dev-util/bloaty/bloaty-9999.ebuild | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dev-util/bloaty/bloaty-1.1.ebuild
b/dev-util/bloaty/bloaty-1.1.ebuild
index d72f426425c5..60319810d1f8 100644
--- a/dev-util/bloaty/bloaty-1.1.ebuild
+++ b/dev-util/bloaty/bloaty-1.1.ebuild
@@ -32,14 +32,17 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14 # needed by protobuf
-DBLOATY_ENABLE_CMAKETARGETS=OFF
-DBUILD_SHARED_LIBS=OFF
)
+
if [[ ${PV} == 9999 ]]; then
mycmakeargs+=(
-DBUILD_TESTING=$(usex test)
$(usex test -DINSTALL_GTEST=OFF "")
)
fi
+
cmake_src_configure
}
diff --git a/dev-util/bloaty/bloaty-9999.ebuild
b/dev-util/bloaty/bloaty-9999.ebuild
index 4aa412ab17d3..c532d76fe085 100644
--- a/dev-util/bloaty/bloaty-9999.ebuild
+++ b/dev-util/bloaty/bloaty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
RESTRICT="!test? ( test )"
else
SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
fi
BDEPEND="
@@ -32,12 +32,17 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14 # needed by protobuf
-DBLOATY_ENABLE_CMAKETARGETS=OFF
+ -DBUILD_SHARED_LIBS=OFF
)
+
if [[ ${PV} == 9999 ]]; then
mycmakeargs+=(
-DBUILD_TESTING=$(usex test)
+ $(usex test -DINSTALL_GTEST=OFF "")
)
fi
+
cmake_src_configure
}