<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9edf9a3869d97465961b562ace085df36a658f5b">https://github.com/macports/macports-ports/commit/9edf9a3869d97465961b562ace085df36a658f5b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9edf9a3869d golang PG: Improved usage of legsacysupport PG to fix builds on older systems
</span>9edf9a3869d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9edf9a3869d97465961b562ace085df36a658f5b
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Apr 16 17:34:04 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> golang PG: Improved usage of legsacysupport PG to fix builds on older systems
</span>---
_resources/port1.0/group/golang-1.0.tcl | 38 ++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/golang-1.0.tcl b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f0b1a5a124a..88b3a69c60a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,29 +150,41 @@ default worksrcdir {gopath/src/${go.package}}
</span>
set go_env {GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} CC=${configure.cc} CXX=${configure.cxx} GOPROXY=off GO111MODULE=off}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.cmd {${go.bin} build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.cmd {${go.bin} build}
</span> default build.args ""
default build.target ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.env ${go_env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.env ${go_env}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default test.cmd {${go.bin} test}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default test.cmd {${go.bin} test}
</span> default test.args ""
default test.target ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default test.env ${go_env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default test.env ${go_env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.env ${go_env}
</span>
proc go.append_env {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.major configure.ldflags configure.cflags build.env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.cc configure.cxx configure.ldflags configure.cflags configure.cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.major build.env workpath
</span> # Following options make sure link options, including those for
# legacy macOS support, are correctly passed.
if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
<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;'>- "CGO_LDFLAGS=${configure.cflags} ${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.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;'>- "CGO_LDFLAGS=${configure.cflags} ${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create a wrapper script around CC,CXX command to enforce use of flags required for legacy support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#!/bin/bash' > ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'exec ${configure.cc} ${configure.cflags} ${configure.ldflags} \"\$\{\@\}\"' >> ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod +x ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#!/bin/bash' > ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'exec ${configure.cxx} ${configure.cxxflags} ${configure.ldflags} \"\$\{\@\}\"' >> ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod +x ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CGO_LDFLAGS=${configure.cflags} ${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${workpath}/go_cc_wrap" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append ${build.env}
</span> }
ui_debug "Set Build/Test Env ${build.env}"
}
</pre><pre style='margin:0'>
</pre>