mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 20:06:43 +02:00
community/go: remove set-external-linker.patch
It was pointed out on IRC by kaey that this patch is no longer needed, make.bash has special handling for Alpine nowadays. Just a cleanup change, thus no pkgrel bump. See: https://github.com/golang/go/issues/18243
This commit is contained in:
Sören Tempel
parent
bff1593e0c
commit
c5706c7522
@ -15,7 +15,6 @@ checkdepends="binutils-gold"
|
||||
subpackages="$pkgname-doc"
|
||||
source="https://golang.org/dl/go${pkgver/_/}.src.tar.gz
|
||||
default-buildmode-pie.patch
|
||||
set-external-linker.patch
|
||||
disable-flaky-sync-test.patch
|
||||
"
|
||||
|
||||
@ -144,5 +143,4 @@ package() {
|
||||
|
||||
sha512sums="e8155cdceca2ebefd386feef98223bbdc92d9316f7188d4ba701cf43a723b75a9bf67a1eb92ac80987b7a113a2fb6981ef235292bec7dd3964805b7c33abdbb1 go1.13.4.src.tar.gz
|
||||
f0c07d9979fc3165fc78158406de8440624b3f2c6f6542c9889c71efbf3d2f02a7ffee27ccba8c2630489895d331b7b9d3a606162134dcb3e8e0b9fc06b529dc default-buildmode-pie.patch
|
||||
faf8de430df185842902322f064254f3e9ecee0884b3075b5550c85da15ff61ea6c2bb8d0fb7cf3887abc0e40974bd73ee8f8c14da7f914dde7e9220177c4e2a set-external-linker.patch
|
||||
6ce14ca43fd35520e667530af91cfcad8902d635e6dd8c04d19428299b9e29ba049120f5eebbb00717a895f052d1cc40d3f522c090786625cce726715a8218ec disable-flaky-sync-test.patch"
|
||||
|
||||
@ -1,106 +0,0 @@
|
||||
This patch is intended to fix https://github.com/golang/go/issues/18243
|
||||
|
||||
diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
|
||||
index 87e8091..4470e05 100644
|
||||
--- a/src/cmd/link/internal/amd64/obj.go
|
||||
+++ b/src/cmd/link/internal/amd64/obj.go
|
||||
@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
PEreloc1: pereloc1,
|
||||
TLSIEtoLE: tlsIEtoLE,
|
||||
|
||||
- Linuxdynld: "/lib64/ld-linux-x86-64.so.2",
|
||||
+ Linuxdynld: "/lib/ld-musl-x86_64.so.1",
|
||||
Freebsddynld: "/libexec/ld-elf.so.1",
|
||||
Openbsddynld: "/usr/libexec/ld.so",
|
||||
Netbsddynld: "/libexec/ld.elf_so",
|
||||
diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go
|
||||
index da16f92..fd14940 100644
|
||||
--- a/src/cmd/link/internal/arm/obj.go
|
||||
+++ b/src/cmd/link/internal/arm/obj.go
|
||||
@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Gentext: gentext,
|
||||
Machoreloc1: machoreloc1,
|
||||
|
||||
- Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI
|
||||
+ Linuxdynld: "/lib/ld-musl-armhf.so.1",
|
||||
Freebsddynld: "/usr/libexec/ld-elf.so.1",
|
||||
Openbsddynld: "/usr/libexec/ld.so",
|
||||
Netbsddynld: "/libexec/ld.elf_so",
|
||||
diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go
|
||||
index 6b386ad..9986371 100644
|
||||
--- a/src/cmd/link/internal/arm64/obj.go
|
||||
+++ b/src/cmd/link/internal/arm64/obj.go
|
||||
@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Gentext: gentext,
|
||||
Machoreloc1: machoreloc1,
|
||||
|
||||
- Linuxdynld: "/lib/ld-linux-aarch64.so.1",
|
||||
+ Linuxdynld: "/lib/ld-musl-aarch64.so.1",
|
||||
|
||||
Freebsddynld: "XXX",
|
||||
Openbsddynld: "XXX",
|
||||
diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go
|
||||
index c5d3451..fd85e63 100644
|
||||
--- a/src/cmd/link/internal/mips/obj.go
|
||||
+++ b/src/cmd/link/internal/mips/obj.go
|
||||
@@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Gentext: gentext,
|
||||
Machoreloc1: machoreloc1,
|
||||
|
||||
- Linuxdynld: "/lib/ld.so.1",
|
||||
+ Linuxdynld: "/lib/ld-musl-mipsle.so.1",
|
||||
|
||||
Freebsddynld: "XXX",
|
||||
Openbsddynld: "XXX",
|
||||
diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go
|
||||
index 83974e5..0f65647 100644
|
||||
--- a/src/cmd/link/internal/mips64/obj.go
|
||||
+++ b/src/cmd/link/internal/mips64/obj.go
|
||||
@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Gentext: gentext,
|
||||
Machoreloc1: machoreloc1,
|
||||
|
||||
- Linuxdynld: "/lib64/ld64.so.1",
|
||||
+ Linuxdynld: "/lib/ld-musl-mips64le.so.1",
|
||||
Freebsddynld: "XXX",
|
||||
Openbsddynld: "XXX",
|
||||
Netbsddynld: "XXX",
|
||||
diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
|
||||
index 273d9b4..abe257d 100644
|
||||
--- a/src/cmd/link/internal/ppc64/obj.go
|
||||
+++ b/src/cmd/link/internal/ppc64/obj.go
|
||||
@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Machoreloc1: machoreloc1,
|
||||
|
||||
// TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
|
||||
- Linuxdynld: "/lib64/ld64.so.1",
|
||||
+ Linuxdynld: "/lib/ld-musl-powerpc64le.so.1",
|
||||
|
||||
Freebsddynld: "XXX",
|
||||
Openbsddynld: "XXX",
|
||||
diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go
|
||||
index 9ac7eb8..b3f7a66 100644
|
||||
--- a/src/cmd/link/internal/s390x/obj.go
|
||||
+++ b/src/cmd/link/internal/s390x/obj.go
|
||||
@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Gentext: gentext,
|
||||
Machoreloc1: machoreloc1,
|
||||
|
||||
- Linuxdynld: "/lib64/ld64.so.1",
|
||||
+ Linuxdynld: "/lib/ld-musl-s390x.so.1",
|
||||
|
||||
// not relevant for s390x
|
||||
Freebsddynld: "XXX",
|
||||
diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go
|
||||
index 6a744dc..d81f392 100644
|
||||
--- a/src/cmd/link/internal/x86/obj.go
|
||||
+++ b/src/cmd/link/internal/x86/obj.go
|
||||
@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {
|
||||
Machoreloc1: machoreloc1,
|
||||
PEreloc1: pereloc1,
|
||||
|
||||
- Linuxdynld: "/lib/ld-linux.so.2",
|
||||
+ Linuxdynld: "/lib/ld-musl-i386.so.1",
|
||||
Freebsddynld: "/usr/libexec/ld-elf.so.1",
|
||||
Openbsddynld: "/usr/libexec/ld.so",
|
||||
Netbsddynld: "/usr/libexec/ld.elf_so",
|
||||
Loading…
x
Reference in New Issue
Block a user