aboutsummaryrefslogtreecommitdiffstats
path: root/community/go
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-09-20 08:30:00 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-09-20 08:31:18 +0000
commit1c27f1578886840fea896f694239160fa9372105 (patch)
treecb28ecf4ad41f9f85c7ced360dd66eb261f63a43 /community/go
parent27aea07b1a1a3f662204948da49354725a5720d1 (diff)
downloadaports-1c27f1578886840fea896f694239160fa9372105.tar.bz2
aports-1c27f1578886840fea896f694239160fa9372105.tar.xz
community/go: fix build on s390x
disable tests without libgcc on s390x
Diffstat (limited to 'community/go')
-rw-r--r--community/go/APKBUILD2
-rw-r--r--community/go/default-buildmode-pie.patch13
2 files changed, 14 insertions, 1 deletions
diff --git a/community/go/APKBUILD b/community/go/APKBUILD
index e985f72800..9a3670372f 100644
--- a/community/go/APKBUILD
+++ b/community/go/APKBUILD
@@ -132,5 +132,5 @@ package() {
}
sha512sums="c6346b1ab256cb743dd98625d8b16cdcc1365b186e039e99747d6c18041045daa065f6bdce17cca0a9800be2dbb34e90adf5518d5295693f80435c02fe5b2cd8 go1.13.src.tar.gz
-a8f3afd97992f03ccf2680cde214eefccac47daeb9eeb689b5e0b206ea3c19cfb23d448a4eb532894d830d4b91cd97b249e88f04c17feba02d9e243b40243bd0 default-buildmode-pie.patch
+f0c07d9979fc3165fc78158406de8440624b3f2c6f6542c9889c71efbf3d2f02a7ffee27ccba8c2630489895d331b7b9d3a606162134dcb3e8e0b9fc06b529dc default-buildmode-pie.patch
faf8de430df185842902322f064254f3e9ecee0884b3075b5550c85da15ff61ea6c2bb8d0fb7cf3887abc0e40974bd73ee8f8c14da7f914dde7e9220177c4e2a set-external-linker.patch"
diff --git a/community/go/default-buildmode-pie.patch b/community/go/default-buildmode-pie.patch
index 3cf4865a78..96adcee50c 100644
--- a/community/go/default-buildmode-pie.patch
+++ b/community/go/default-buildmode-pie.patch
@@ -12,3 +12,16 @@ index 7f894f5..a37cbf3 100644
codegenArg = "-shared"
ldBuildmode = "pie"
case "darwin/arm", "darwin/arm64":
+diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
+index f63c946..80ad134 100644
+--- a/src/cmd/dist/test.go
++++ b/src/cmd/dist/test.go
+@@ -553,7 +553,7 @@ func (t *tester) registerTests() {
+ }
+
+ // ARM libgcc may be Thumb, which internal linking does not support.
+- if goarch == "arm" {
++ if goarch == "arm" || goarch == "s390x" {
+ break
+ }
+