summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2015-11-27 13:56:23 -0600
committerWilliam Hubbs <williamh@gentoo.org>2015-11-27 14:39:09 -0600
commit2fe67f29b8e17de2dad0823ddf349a298e5960c2 (patch)
tree08b33e6f204e969b709c5fd1a23ae976e1ba3ab0 /dev-lang
parentapp-misc/gourmet: Add patch to address gourmet pull request 824; also elimina... (diff)
downloadgentoo-2fe67f29b8e17de2dad0823ddf349a298e5960c2.tar.gz
gentoo-2fe67f29b8e17de2dad0823ddf349a298e5960c2.tar.bz2
gentoo-2fe67f29b8e17de2dad0823ddf349a298e5960c2.zip
dev-lang/go: remove incorrect patch for #558368
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/go/files/go-1.5.1-darwin-sysctl.patch11
-rw-r--r--dev-lang/go/go-1.5.1-r1.ebuild1
-rw-r--r--dev-lang/go/go-1.5.1.ebuild1
3 files changed, 0 insertions, 13 deletions
diff --git a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch
deleted file mode 100644
index 5cec4b608286..000000000000
--- a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cmd/dist/util.go.
-+++ src/cmd/dist/util.go
-@@ -404,7 +404,7 @@
- switch gohostos {
- case "darwin":
- // Even on 64-bit platform, darwin uname -m prints i386.
-- if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") {
-+ if strings.Contains(run("", CheckExit, "/usr/sbin/sysctl", "machdep.cpu.extfeatures"), "EM64T") {
- gohostarch = "amd64"
- }
- case "solaris":
diff --git a/dev-lang/go/go-1.5.1-r1.ebuild b/dev-lang/go/go-1.5.1-r1.ebuild
index 23d37172ec09..ed766ec3876d 100644
--- a/dev-lang/go/go-1.5.1-r1.ebuild
+++ b/dev-lang/go/go-1.5.1-r1.ebuild
@@ -113,7 +113,6 @@ src_prepare()
sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go ||
die 'sed failed'
fi
- epatch "${FILESDIR}"/${P}-darwin-sysctl.patch
epatch_user
}
diff --git a/dev-lang/go/go-1.5.1.ebuild b/dev-lang/go/go-1.5.1.ebuild
index 139b35042ebe..a69f787266ee 100644
--- a/dev-lang/go/go-1.5.1.ebuild
+++ b/dev-lang/go/go-1.5.1.ebuild
@@ -113,7 +113,6 @@ src_prepare()
sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go ||
die 'sed failed'
fi
- epatch "${FILESDIR}"/${P}-darwin-sysctl.patch
epatch_user
}