<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bcfdbd30124a6a6cbfa3fd1afc2da704f6d32b92">https://github.com/macports/macports-ports/commit/bcfdbd30124a6a6cbfa3fd1afc2da704f6d32b92</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bcfdbd30124a6a6cbfa3fd1afc2da704f6d32b92
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Mon Oct 7 03:25:55 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> lang/go: remove custom patches.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The BOOT_GO_LDFLAGS patch was merged upstream, so it's obsolete here.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patch working around a base env issue via GO_EXT_LDFLAGS can also be
</span><span style='display:block; white-space:pre;color:#404040;'> dropped since MP base 2.6.0 has been released.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The port currently needs the legacy-support-devel port to correctly
</span><span style='display:block; white-space:pre;color:#404040;'> build on legacy platforms. Once the necessary changes are fully
</span><span style='display:block; white-space:pre;color:#404040;'> released, the "normal" legacy-support port will work as well.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/58935
</span>---
lang/go/Portfile | 15 +----
lang/go/files/dist-support-BOOT_GO_LDFLAGS.patch | 32 ----------
.../workaround-base-env-issue-GO_EXT_LDFLAGS.patch | 71 ----------------------
3 files changed, 3 insertions(+), 115 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/go/Portfile b/lang/go/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77dccba..a192759 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/go/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/go/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,18 +74,9 @@ if {${os.platform} eq "darwin" && ${os.major} <= ${legacysupport.newest_darwin_r
</span> # since go doesn't use the standard CFLAGS/CXXFLAGS.
# We need to patch the build system and set up env variables manually.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append dist-support-BOOT_GO_LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "GO_EXTLINK_ENABLED=1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GO_LDFLAGS=\"-extldflags=${configure.ldflags}\"" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "BOOT_GO_LDFLAGS=-extldflags=${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append workaround-base-env-issue-GO_EXT_LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append GO_EXTLINK_ENABLED="1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GO_EXT_LDFLAGS="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOT_GO_EXT_LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "GO_EXTLINK_ENABLED=1" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GO_LDFLAGS=\"-extldflags=${configure.ldflags}\"" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "BOOT_GO_LDFLAGS=-extldflags=${configure.ldflags}"
</span>
notes-append [subst {
go had to be specially patched and built to work on your platform.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/go/files/dist-support-BOOT_GO_LDFLAGS.patch b/lang/go/files/dist-support-BOOT_GO_LDFLAGS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9032bb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/go/files/dist-support-BOOT_GO_LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cmd/dist/build.go.old 2019-03-14 20:43:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cmd/dist/build.go 2019-03-19 11:46:25.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,6 +190,7 @@ func xinit() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gogcflags = os.Getenv("BOOT_GO_GCFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goldflags = os.Getenv("BOOT_GO_LDFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc, cxx := "gcc", "g++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if defaultclang {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -646,7 +647,11 @@ func runInstall(dir string, ch chan stru
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if elem == "go" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elem = "go_bootstrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- link = []string{pathf("%s/link", tooldir), "-o", pathf("%s/%s%s", tooldir, elem, exe)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link = []string{pathf("%s/link", tooldir)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if goldflags != "" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link = append(link, goldflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link = append (link, "-o", pathf("%s/%s%s", tooldir, elem, exe))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- targ = len(link) - 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ttarg := mtime(link[targ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1237,7 +1242,7 @@ func cmdbootstrap() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- goldflags = os.Getenv("GO_LDFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goBootstrap := pathf("%s/go_bootstrap", tooldir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmdGo := pathf("%s/go", gobin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if debug {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/go/files/workaround-base-env-issue-GO_EXT_LDFLAGS.patch b/lang/go/files/workaround-base-env-issue-GO_EXT_LDFLAGS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ce1c64f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/go/files/workaround-base-env-issue-GO_EXT_LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,71 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cmd/dist/build.go.old 2019-03-19 14:24:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cmd/dist/build.go 2019-03-19 14:30:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,7 @@ var (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goextlinkenabled string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gogcflags string // For running built compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goldflags string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goextldflags string // Flags passed to external linker, if enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tooldir string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- oldgoos string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,6 +192,7 @@ func xinit() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gogcflags = os.Getenv("BOOT_GO_GCFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goldflags = os.Getenv("BOOT_GO_LDFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goextldflags = os.Getenv("BOOT_GO_EXT_LDFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc, cxx := "gcc", "g++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if defaultclang {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -651,6 +653,9 @@ func runInstall(dir string, ch chan stru
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if goldflags != "" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link = append(link, goldflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if goextldflags != "" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link = append(link, "-extldflags=" + goextldflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link = append (link, "-o", pathf("%s/%s%s", tooldir, elem, exe))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- targ = len(link) - 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1243,6 +1248,7 @@ func cmdbootstrap() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goextldflags = os.Getenv("GO_EXT_LDFLAGS") // we were using $BOOT_GO_EXT_LDFLAGS until now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goBootstrap := pathf("%s/go_bootstrap", tooldir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmdGo := pathf("%s/go", gobin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if debug {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1378,7 +1384,12 @@ func cmdbootstrap() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- func goInstall(goBinary string, args ...string) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- installCmd := []string{goBinary, "install", "-gcflags=all=" + gogcflags, "-ldflags=all=" + goldflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ installCmd := []string{goBinary, "install", "-gcflags=all=" + gogcflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if goextldflags != "" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ installCmd = append(installCmd, "-ldflags=all=" + goldflags + " \"-extldflags=" + goextldflags + "\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ installCmd = append(installCmd, "-ldflags=all=" + goldflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if vflag > 0 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installCmd = append(installCmd, "-v")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1392,12 +1403,15 @@ func goInstall(goBinary string, args ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- func checkNotStale(goBinary string, targets ...string) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkCmd := []string{goBinary, "list", "-gcflags=all=" + gogcflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if goextldflags != "" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkCmd = append(checkCmd, "-ldflags=all=" + goldflags + " \"-extldflags=" + goextldflags + "\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkCmd = append(checkCmd, "-ldflags=all=" + goldflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkCmd = append(checkCmd, "-f={{if .Stale}}\tSTALE {{.ImportPath}}: {{.StaleReason}}{{end}}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out := run(goroot, CheckExit,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- append([]string{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- goBinary,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "list", "-gcflags=all=" + gogcflags, "-ldflags=all=" + goldflags,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "-f={{if .Stale}}\tSTALE {{.ImportPath}}: {{.StaleReason}}{{end}}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }, targets...)...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ append(checkCmd, targets...)...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if strings.Contains(out, "\tSTALE ") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.Setenv("GODEBUG", "gocachehash=1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for _, target := range []string{"runtime/internal/sys", "cmd/dist", "cmd/link"} {
</span></pre><pre style='margin:0'>
</pre>