diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2022-01-10 09:00:00 +0000 |
---|---|---|
committer | Yixun Lan <dlan@gentoo.org> | 2022-01-29 23:18:21 +0800 |
commit | 0a5ea2310336c80c6e1c37ac3b2e2a03ec04fd21 (patch) | |
tree | 7674ab231785b80128019addbf5c85f6c2c92db3 /dev-libs/protobuf | |
parent | app-i18n/mozc: Partially revert "depend on older protobuf". (diff) | |
download | gentoo-0a5ea2310336c80c6e1c37ac3b2e2a03ec04fd21.tar.gz gentoo-0a5ea2310336c80c6e1c37ac3b2e2a03ec04fd21.tar.bz2 gentoo-0a5ea2310336c80c6e1c37ac3b2e2a03ec04fd21.zip |
dev-libs/protobuf: Disable check for Objective C compiler on non-macOS systems.
Closes: https://bugs.gentoo.org/830584
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'dev-libs/protobuf')
-rw-r--r-- | dev-libs/protobuf/protobuf-3.16.0.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/protobuf/protobuf-3.17.0.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/protobuf/protobuf-3.17.1.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/protobuf/protobuf-3.17.2.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/protobuf/protobuf-3.17.3.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/protobuf/protobuf-3.19.1.ebuild | 4 |
6 files changed, 18 insertions, 6 deletions
diff --git a/dev-libs/protobuf/protobuf-3.16.0.ebuild b/dev-libs/protobuf/protobuf-3.16.0.ebuild index 68eb4507463b..404c91cdd4aa 100644 --- a/dev-libs/protobuf/protobuf-3.16.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.16.0.ebuild @@ -58,6 +58,9 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8460 sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + # https://github.com/protocolbuffers/protobuf/issues/9392 + sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die + eautoreconf } @@ -74,7 +77,6 @@ src_configure() { multilib_src_configure() { local options=( - OBJC="$(tc-getBUILD_CC)" $(use_enable static-libs static) $(use_with zlib) ) diff --git a/dev-libs/protobuf/protobuf-3.17.0.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild index 390df7df0b7c..ab50d514273e 100644 --- a/dev-libs/protobuf/protobuf-3.17.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.17.0.ebuild @@ -58,6 +58,9 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8460 sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + # https://github.com/protocolbuffers/protobuf/issues/9392 + sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die + eautoreconf } @@ -74,7 +77,6 @@ src_configure() { multilib_src_configure() { local options=( - OBJC="$(tc-getBUILD_CC)" $(use_enable static-libs static) $(use_with zlib) ) diff --git a/dev-libs/protobuf/protobuf-3.17.1.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild index 390df7df0b7c..ab50d514273e 100644 --- a/dev-libs/protobuf/protobuf-3.17.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.17.1.ebuild @@ -58,6 +58,9 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8460 sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + # https://github.com/protocolbuffers/protobuf/issues/9392 + sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die + eautoreconf } @@ -74,7 +77,6 @@ src_configure() { multilib_src_configure() { local options=( - OBJC="$(tc-getBUILD_CC)" $(use_enable static-libs static) $(use_with zlib) ) diff --git a/dev-libs/protobuf/protobuf-3.17.2.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild index 390df7df0b7c..ab50d514273e 100644 --- a/dev-libs/protobuf/protobuf-3.17.2.ebuild +++ b/dev-libs/protobuf/protobuf-3.17.2.ebuild @@ -58,6 +58,9 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8460 sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + # https://github.com/protocolbuffers/protobuf/issues/9392 + sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die + eautoreconf } @@ -74,7 +77,6 @@ src_configure() { multilib_src_configure() { local options=( - OBJC="$(tc-getBUILD_CC)" $(use_enable static-libs static) $(use_with zlib) ) diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild index a29ab8dcb86c..400858520580 100644 --- a/dev-libs/protobuf/protobuf-3.17.3.ebuild +++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild @@ -58,6 +58,9 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8460 sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + # https://github.com/protocolbuffers/protobuf/issues/9392 + sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die + eautoreconf } @@ -74,7 +77,6 @@ src_configure() { multilib_src_configure() { local options=( - OBJC="$(tc-getBUILD_CC)" $(use_enable static-libs static) $(use_with zlib) ) diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild index 41c154dc9b6a..3ad04bc9adfe 100644 --- a/dev-libs/protobuf/protobuf-3.19.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild @@ -55,6 +55,9 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8460 sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + # https://github.com/protocolbuffers/protobuf/issues/9392 + sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die + eautoreconf } @@ -71,7 +74,6 @@ src_configure() { multilib_src_configure() { local options=( - OBJC="$(tc-getBUILD_CC)" $(use_enable static-libs static) $(use_with zlib) ) |