extra/go: Rebase patch and disable go17 bootstrap

2 files changed, 7 insertions, 12 deletions

diff --git a/extra/go/PKGBUILD b/extra/go/PKGBUILD
index c4adc372..a9fa58bd 100644
--- a/extra/go/PKGBUILD
+++ b/extra/go/PKGBUILD
@@ -33,7 +33,7 @@ fi
 
 # https://go-review.googlesource.com/c/go/+/257963
 source+=('go-x87.patch')
-sha256sums+=('8b124eaa7521bd0e3760b514829b1ecce3d3cd169f99c3629ff50b7769303802')
+sha256sums+=('10e036bb7b9c468485a4ea878343918160b914a51aad67ad75839c85bd492b54')
 eval "$(
   {
     declare -f prepare || \
@@ -46,7 +46,3 @@ eval "$(
 
 # tests are failing, ignore them
 unset check
-
-# bootstrap via go17
-makedepends=(${makedepends[@]//go/})
-makedepends+=('go17')
diff --git a/extra/go/go-x87.patch b/extra/go/go-x87.patch
index 0c0a584b..96da987c 100644
--- a/extra/go/go-x87.patch
+++ b/extra/go/go-x87.patch
@@ -1,15 +1,14 @@
-diff -rauN go/src/buildall.bash go-x87-patch/src/buildall.bash
---- go/src/buildall.bash	2023-04-04 17:38:07.330008547 +0200
-+++ go-x87-patch/src/buildall.bash	2023-04-04 17:39:07.929938685 +0200
-@@ -37,6 +37,7 @@
- 
+--- go/src/buildall.bash	2024-03-29 15:27:02.000000000 +0000
++++ buildall.bash	2024-04-07 22:22:43.457800687 +0000
+@@ -42,6 +42,7 @@
  gettargets() {
- 	../bin/go tool dist list | sed -e 's|/|-|'
+ 	../bin/go tool dist list | sed -e 's|/|-|' |
+ 		egrep -v '^(android|ios)' # need C toolchain even for cross-compiling
 +	echo linux-386-387
  	echo linux-arm-arm5
  }
  
-@@ -63,11 +64,15 @@
+@@ -68,11 +69,15 @@
  	echo "### Building $target"
  	export GOOS=$(echo $target | sed 's/-.*//')
  	export GOARCH=$(echo $target | sed 's/.*-//')