From e17fc4769ba8ba053747cada6eefe8be69ffc553 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Wed, 20 Apr 2022 13:10:25 -0500 Subject: system/gcc: add patch for libgo w/ musl 1.2.3. fixes #539. --- system/gcc/APKBUILD | 5 ++++- system/gcc/libgo-musl-1.2.3.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 system/gcc/libgo-musl-1.2.3.patch diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD index 5c36d2c61..b8dfbd37f 100644 --- a/system/gcc/APKBUILD +++ b/system/gcc/APKBUILD @@ -6,7 +6,7 @@ pkgver=8.5.0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname="$pkgname$_target" -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="https://gcc.gnu.org" arch="all" @@ -185,6 +185,8 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz gcc-5.4.0-locale.patch backport-r267157-posix-conformant-snprintf.patch + + libgo-musl-1.2.3.patch " # we build out-of-tree @@ -559,6 +561,7 @@ a3702c1f642412413d0ffc69f6439a3e101b2b56c16610f94c66556c88e52d01b0b6d1e57bfc5a97 152639228a189b211df660b5b7543e3744cf136e80fed7f1ac37a3bc1b692fba3431a0d62337e769ee8f323188acdf11092cb1b2ef5c75fafee9628d13bc4163 202-ibm-ldbl.patch 98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1 205-nopie.patch d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b libgcc-always-build-gcceh.a.patch +fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93 libgo-musl-1.2.3.patch 600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d gcc-4.9-musl-fortify.patch dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4 gcc-6.1-musl-libssp.patch fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7 gcc-pure64.patch diff --git a/system/gcc/libgo-musl-1.2.3.patch b/system/gcc/libgo-musl-1.2.3.patch new file mode 100644 index 000000000..15a4229f4 --- /dev/null +++ b/system/gcc/libgo-musl-1.2.3.patch @@ -0,0 +1,13 @@ +diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh +index 6fef104..06289a4 100755 +--- a/libgo/mksysinfo.sh ++++ b/libgo/mksysinfo.sh +@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then + fi + + # The syscall numbers. We force the names to upper case. +-grep '^const _SYS_' gen-sysinfo.go | \ ++grep '^const _SYS_[a-z]' gen-sysinfo.go | \ + sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \ + while read sys; do + sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` -- cgit v1.2.3-60-g2f50