aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2022-04-11 18:54:24 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2022-04-11 19:12:09 +0200
commit6f07567ef59c9410aa58de67269a4067d9375fd6 (patch)
tree7b24212a1df6c33e6d4011cb8b96adf743f45809
parentc2b77c103d6c8fc361ded5da57c458dbfeeed53f (diff)
downloadaports-6f07567ef59c9410aa58de67269a4067d9375fd6.tar.gz
aports-6f07567ef59c9410aa58de67269a4067d9375fd6.tar.bz2
aports-6f07567ef59c9410aa58de67269a4067d9375fd6.tar.xz
main/gcc: fix build with musl 1.2.3
fix the build error: sysinfo.go:6606:7: error: redefinition of 'SYS_SECCOMP' 6606 | const SYS_SECCOMP = _SYS_SECCOMP | ^ sysinfo.go:6600:7: note: previous definition of 'SYS_SECCOMP' was here 6600 | const SYS_SECCOMP = _SYS_seccomp | ^ Upstream report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105225
-rw-r--r--main/gcc/APKBUILD4
-rw-r--r--main/gcc/libgo-musl-1.2.3.patch13
2 files changed, 16 insertions, 1 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 7ff8a258a0..f0ec4ee18c 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -9,7 +9,7 @@ pkgver=11.2.1_git20220219
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -231,6 +231,7 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
+ libgo-musl-1.2.3.patch
"
# we build out-of-tree
@@ -749,4 +750,5 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
+fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93 libgo-musl-1.2.3.patch
"
diff --git a/main/gcc/libgo-musl-1.2.3.patch b/main/gcc/libgo-musl-1.2.3.patch
new file mode 100644
index 0000000000..15a4229f4e
--- /dev/null
+++ b/main/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`