git » go-1.20.git » commit 8f84ded

Updated -pie patch for go 1.14

author Morten Linderud
2020-02-26 19:44:10 UTC
committer Morten Linderud
2020-02-26 19:44:10 UTC
parent 7ce55d78c32dd811c685c546559511936282e563

Updated -pie patch for go 1.14

PKGBUILD +3 -3
default-buildmode-pie.patch +5 -6

diff --git a/PKGBUILD b/PKGBUILD
index 74817c7..35b437a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
 pkgbase=go
 pkgname=(go go-pie)
 epoch=2
-pkgver=1.13.8
+pkgver=1.14
 pkgrel=1
 arch=(x86_64)
 url='https://golang.org/'
@@ -22,8 +22,8 @@ license=(BSD)
 makedepends=(git go)
 source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz
         default-buildmode-pie.patch)
-sha256sums=('b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34'
-            '9d2f0d201d4e002d74f548cc82bd131139bab5dd62191004c71dd430fdc1666d')
+sha256sums=('6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389'
+            'be1269689de3cf5c926cf7de07f88d2a6d1ecbfc86694baaf5baee3bdcfdd79a')
 
 prepare() {
   cp -r $pkgbase $pkgbase-pie
diff --git a/default-buildmode-pie.patch b/default-buildmode-pie.patch
index 3b018b7..dcf7ed3 100644
--- a/default-buildmode-pie.patch
+++ b/default-buildmode-pie.patch
@@ -2,13 +2,12 @@ diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go
 index 7f894f5..a517887 100644
 --- a/src/cmd/go/internal/work/init.go
 +++ b/src/cmd/go/internal/work/init.go
-@@ -111,7 +111,8 @@ func buildModeInit() {
+@@ -131,7 +131,7 @@ func buildModeInit() {
  		ldBuildmode = "c-shared"
  	case "default":
- 		switch platform {
--		case "android/arm", "android/arm64", "android/amd64", "android/386":
-+		case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le",
-+			"android/arm", "android/arm64", "android/amd64", "android/386":
+ 		switch cfg.Goos {
+-		case "android":
++		case "android", "linux":
  			codegenArg = "-shared"
  			ldBuildmode = "pie"
- 		case "darwin/arm", "darwin/arm64":
+ 		case "darwin":