commit 8dc10af

hovercats  ·  2024-08-29 04:45:53 +0000 UTC
parent 5ba769e
go: 1.23.0
6 files changed,  +37, -47
+1, -1
1@@ -4,7 +4,7 @@
2 # This breaks Go.
3 :> nostrip
4 
5-patch -p1 < 0001-use-POSIX-sh-and-remove-some-bashism.patch
6+patch -p1 < 0001-src-make.bash-use-POSIX-sh-and-remove-some-bashism.patch
7 
8 export CC="${CC:-cc}"
9 export GOARCH=amd64
+2, -2
1@@ -1,2 +1,2 @@
2-a679eed63bfcfd3e9bb76e87ef86d1f4732e0c70cd077c61e831a74a4057adfc95
3-2763ff2b000cd7b1fd080aed63933e0f92eecc4debcfb349b08261613e545af5a2
4+8bfbcfc1a552e949d5562514c2eed8ca65029c3745d92d204d55db87147dc172a9
5+f962ff680628c0791fce6f1df1cb1e43c09cdbeea741e668df6053215edd68d70a
+31, -0
 1@@ -0,0 +1,31 @@
 2+From 438f1fcaef381fe3950ee7b6bfddc1233d487f73 Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 29 Aug 2024 06:44:15 +0200
 5+Subject: [PATCH] src/make.bash: use POSIX sh and remove some bashism
 6+
 7+---
 8+ src/make.bash | 4 ++--
 9+ 1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+diff --git a/src/make.bash b/src/make.bash
12+index 814b7e8..b5344b1 100755
13+--- a/src/make.bash
14++++ b/src/make.bash
15+@@ -1,4 +1,4 @@
16+-#!/usr/bin/env bash
17++#!/bin/sh
18+ # Copyright 2009 The Go Authors. All rights reserved.
19+ # Use of this source code is governed by a BSD-style
20+ # license that can be found in the LICENSE file.
21+@@ -164,7 +164,7 @@ bootstrapenv() {
22+ }
23+ 
24+ export GOROOT="$(cd .. && pwd)"
25+-IFS=$'\n'; for go_exe in $(type -ap go); do
26++for go_exe in $(command -v go); do
27+ 	if [[ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]]; then
28+ 		goroot_bootstrap=$GOROOT_BOOTSTRAP
29+ 		GOROOT_BOOTSTRAP=""
30+-- 
31+2.45.1
32+
+0, -41
 1@@ -1,41 +0,0 @@
 2-From 2a412d83fc519ab0c1ef5dc5aab4431a46315706 Mon Sep 17 00:00:00 2001
 3-From: hovercats <hovercatswithlasereyes@protonmail.com>
 4-Date: Tue, 14 May 2024 06:55:43 +0200
 5-Subject: [PATCH] use POSIX sh and remove some bashism
 6-
 7----
 8- src/make.bash | 6 ++++--
 9- 1 file changed, 4 insertions(+), 2 deletions(-)
10-
11-diff --git a/src/make.bash b/src/make.bash
12-index 76ad516..73f5a26 100755
13---- a/src/make.bash
14-+++ b/src/make.bash
15-@@ -1,4 +1,4 @@
16--#!/usr/bin/env bash
17-+#!/bin/sh
18- # Copyright 2009 The Go Authors. All rights reserved.
19- # Use of this source code is governed by a BSD-style
20- # license that can be found in the LICENSE file.
21-@@ -167,7 +167,7 @@ nogoenv() {
22- }
23- 
24- export GOROOT="$(cd .. && pwd)"
25--IFS=$'\n'; for go_exe in $(type -ap go); do
26-+for go_exe in $(command -v go); do
27- 	if [[ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]]; then
28- 		goroot=$(GOROOT= nogoenv "$go_exe" env GOROOT)
29- 		if [[ "$goroot" != "$GOROOT" ]]; then
30-@@ -198,7 +198,9 @@ if [[ "$GOROOT_BOOTSTRAP" == "$GOROOT" ]]; then
31- 	exit 1
32- fi
33- rm -f cmd/dist/dist
34-+(
35- GOROOT="$GOROOT_BOOTSTRAP" nogoenv "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
36-+)
37- 
38- # -e doesn't propagate out of eval, so check success by hand.
39- eval $(./cmd/dist/dist env -p || echo FAIL=true)
40--- 
41-2.44.0
42-
+2, -2
1@@ -1,2 +1,2 @@
2-https://golang.org/dl/go1.22.5.src.tar.gz
3-patches/0001-use-POSIX-sh-and-remove-some-bashism.patch
4+https://golang.org/dl/go1.23.0.src.tar.gz
5+patches/0001-src-make.bash-use-POSIX-sh-and-remove-some-bashism.patch
+1, -1
1@@ -1 +1 @@
2-1.22.5 1
3+1.23.0 1