[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/

[Yixun Lan]

commit:     f96bd0cd2896fc8ea3a83404c90acd7a76991367
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Jan 22 02:00:00 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 15:19:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96bd0cd

dev-libs/protobuf: Delete static assertion failing on HPPA.

Closes: https://bugs.gentoo.org/831728
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-libs/protobuf/protobuf-3.18.2.ebuild | 3 +++
 dev-libs/protobuf/protobuf-3.19.3.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dev-libs/protobuf/protobuf-3.18.2.ebuild b/dev-libs/protobuf/protobuf-3.18.2.ebuild
index 8abb87bc6f00..f0dbf35e965e 100644
--- a/dev-libs/protobuf/protobuf-3.18.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.18.2.ebuild
@@ -61,6 +61,9 @@ src_prepare() {
 	# 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
 
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
 	eautoreconf
 }
 

diff --git a/dev-libs/protobuf/protobuf-3.19.3.ebuild b/dev-libs/protobuf/protobuf-3.19.3.ebuild
index 7d80384736a4..9171eaebedbc 100644
--- a/dev-libs/protobuf/protobuf-3.19.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.3.ebuild
@@ -61,6 +61,9 @@ src_prepare() {
 	# 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
 
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
 	eautoreconf
 }