commit 9ad515f

hovercats  ·  2024-05-02 16:52:29 +0000 UTC
parent c7d348b 
go: make patch be more consistent
4 files changed,  +17, -7
M repo/go/build
M repo/go/checksums
R repo/go/patches/0001-use-POSIX-sh-and-remove-some-bashism.patch
M repo/go/sources
M repo/go/build
+1, -3 
 1@@ -4,9 +4,7 @@
 2 # This breaks Go.
 3 :> nostrip
 4 
 5-for p in *.patch; do
 6-    patch -p1 < "$p"
 7-done
 8+patch -p1 < 0001-use-POSIX-sh-and-remove-some-bashism.patch
 9 
10 export CC="${CC:-cc}"
11 export GOARCH=amd64
M repo/go/checksums
+1, -1 
1@@ -1,2 +1,2 @@
2 c354c8fc216f0b648156d23282c6af112e7b67d89ea8a10187db5733a148ab1131
3-63a90fa660646a32681446422940e59288de12341be7c4e0c224206a2543e1dc5b
4+585d692abfbd838f1bbad8b261bf4b262fcbf721939df07d5f3d1cb98f56e04c6e
R repo/go/patches/posix-build.patch => repo/go/patches/0001-use-POSIX-sh-and-remove-some-bashism.patch
+14, -2 
 1@@ -1,10 +1,19 @@
 2+From c5be8dadf89e66a355564f682a13b088d38563d8 Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 2 May 2024 18:51:08 +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 755b3b0b9e..96750b4842 100755
13+index 755b3b0..4a14dcb 100755
14 --- a/src/make.bash
15 +++ b/src/make.bash
16 @@ -1,4 +1,4 @@
17 -#!/usr/bin/env bash
18-+#!/usr/bin/env sh
19++#!/bin/sh
20  # Copyright 2009 The Go Authors. All rights reserved.
21  # Use of this source code is governed by a BSD-style
22  # license that can be found in the LICENSE file.
23@@ -27,3 +36,6 @@ index 755b3b0b9e..96750b4842 100755
24  
25  # -e doesn't propagate out of eval, so check success by hand.
26  eval $(./cmd/dist/dist env -p || echo FAIL=true)
27+-- 
28+2.44.0
29+
M repo/go/sources
+1, -1 
1@@ -1,2 +1,2 @@
2 https://golang.org/dl/go1.21.6.src.tar.gz
3-patches/posix-build.patch
4+patches/0001-use-POSIX-sh-and-remove-some-bashism.patch