Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra/protobuf/PKGBUILD
diff options
context:
space:
mode:
authorTasos Sahanidis <tasos@tasossah.com>2023-02-13 23:15:20 +0200
committerErich Eckner <git@eckner.net>2023-02-14 06:14:04 +0100
commitf7dc0a31cf3d52cc5f0c73a5303021b23151b8f6 (patch)
tree36e9385c22fbc7e3847595c8cf4fe4ef6de85451 /extra/protobuf/PKGBUILD
parente8aa8914b276efd49eba297669afe04d3ccf311e (diff)
extra/protobuf: Fix static assert fail for 32 bit builds
Diffstat (limited to 'extra/protobuf/PKGBUILD')
-rw-r--r--extra/protobuf/PKGBUILD21
1 files changed, 20 insertions, 1 deletions
diff --git a/extra/protobuf/PKGBUILD b/extra/protobuf/PKGBUILD
index 3d825fe1..9e67a5b0 100644
--- a/extra/protobuf/PKGBUILD
+++ b/extra/protobuf/PKGBUILD
@@ -1,8 +1,26 @@
+source+=('https://github.com/protocolbuffers/protobuf/commit/c94b66706bec17d918495f4715183a5eaf0f8044.patch'
+ 'fix_static_assert_fail_on_32bit.patch'
+)
+
+sha512sums+=('SKIP'
+ 'c124cdab5cfb45274d6cfc45d1eb3bb4d6a6e9128a4b84ca0c3b6dd5ddbfa69bb3cf168dc2a5f51ffdd9125246e5e134e22943e56ccdda78a4a0b90eb6ccd164'
+)
+
+_prepare() {
+ patch -d $pkgbase-$pkgver -p1 < fix_static_assert_fail_on_32bit.patch # Fix 32 bit builds
+ patch -d $pkgbase-$pkgver -p1 < c94b66706bec17d918495f4715183a5eaf0f8044.patch # Fix some 32 bit tests
+}
+
+eval "$(
+ declare -f prepare | \
+ sed '$ i _prepare'
+)"
+
# ignore failing tests
eval "$(
declare -f check | \
sed '
- s@make check@make check || true@
+ s@cmake --build build --target check@cmake --build build --target check || true@
s@python setup.py test@python setup.py test || true@
'
)
@@ -14,3 +32,4 @@ if [ "$CARCH" = 'i486' ]; then
1i options=(!lto)
' PKGBUILD
fi
+