<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/c32192569195f8b0bc5954974983a07ef7a57c42">https://github.com/macports/macports-ports/commit/c32192569195f8b0bc5954974983a07ef7a57c42</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 c3219256919 golang PG: Revert change that wraps compiler and sets various GO env vars on newer systems
</span>c3219256919 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c32192569195f8b0bc5954974983a07ef7a57c42
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Apr 18 15:32:10 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> golang PG: Revert change that wraps compiler and sets various GO env vars on newer systems
</span>---
_resources/port1.0/group/golang-1.0.tcl | 66 ++++++++++++++++-----------------
1 file changed, 32 insertions(+), 34 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 5b7b5e906d1..01c3befbf76 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;'>@@ -149,11 +149,7 @@ set gopath ${workpath}/gopath
</span> default worksrcdir {gopath/src/${go.package}}
set go_env {GOPATH=${gopath} GOARCH=${goarch} GOOS=${goos} GOPROXY=off GO111MODULE=off \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} CXX=${configure.cxx} FC=${configure.fc} OBJC=${configure.objc} OBJCXX=${configure.objcxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CGO_CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CGO_CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CGO_LDFLAGS=${configure.cflags} ${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GO_LDFLAGS=-extldflags='${configure.ldflags} [get_canonical_archflags ld]'" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} CXX=${configure.cxx} FC=${configure.fc} OBJC=${configure.objc} OBJCXX=${configure.objcxx} }
</span>
default build.cmd {${go.bin} build}
default build.args ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,41 +169,43 @@ proc go.append_env {} {
</span> # Create a wrapper scripts around compiler commands to enforce use of MacPorts flags
# and to aid use of MacPorts legacysupport library as required.
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove '-static' from compilation options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set flags "\$\{\@\//-static/\}"
</span> if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
# Note, go annoyingly uses CC for both building and linking, and thus in order to get it to correctly
# link to the legacy support library, the ldflags need to be added to the cc and ccx wrappers.
# To then prevent 'clang linker input unused' errors we must append -Wno-error at the end.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set flags "${configure.ldflags} ${flags} -Wno-error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also remove '-static' from compilation options as this is not supported on older systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set flags "${configure.ldflags} \$\{\@\//-static/\} -Wno-error"
</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 'CMD=\"${configure.cc} ${configure.cflags} [get_canonical_archflags cc] ${flags}\"' >> ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'echo \${CMD} ; exec \${CMD}' >> ${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 'CMD=\"${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx] ${flags}\"' >> ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'echo \${CMD} ; exec \${CMD}' >> ${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;'>+ system "echo '#!/bin/bash' > ${workpath}/go_objc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'CMD=\"${configure.objc} ${configure.objcflags} [get_canonical_archflags objc] ${flags}\"' >> ${workpath}/go_objc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'echo \${CMD} ; exec \${CMD}' >> ${workpath}/go_objc_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_objcxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'CMD=\"${configure.objcxx} ${configure.objcxxflags} [get_canonical_archflags objcxx] ${flags}\"' >> ${workpath}/go_objcxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'echo \${CMD} ; exec \${CMD}' >> ${workpath}/go_objcxx_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;'>+ build.env-append \
</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;'>+ "OBJC=${workpath}/go_objc_wrap" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OBJCXX=${workpath}/go_objcxx_wrap" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GO_EXTLINK_ENABLED=1" \
</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_CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CGO_CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CGO_LDFLAGS=${configure.cflags} ${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GO_LDFLAGS=-extldflags='${configure.ldflags} [get_canonical_archflags ld]'"
</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> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'CMD=\"${configure.cc} ${configure.cflags} [get_canonical_archflags cc] ${flags}\"' >> ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'echo \${CMD} ; exec \${CMD}' >> ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'CMD=\"${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx] ${flags}\"' >> ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'echo \${CMD} ; exec \${CMD}' >> ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${workpath}/go_objc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'CMD=\"${configure.objc} ${configure.objcflags} [get_canonical_archflags objc] ${flags}\"' >> ${workpath}/go_objc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'echo \${CMD} ; exec \${CMD}' >> ${workpath}/go_objc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${workpath}/go_objcxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'CMD=\"${configure.objcxx} ${configure.objcxxflags} [get_canonical_archflags objcxx] ${flags}\"' >> ${workpath}/go_objcxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'echo \${CMD} ; exec \${CMD}' >> ${workpath}/go_objcxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${workpath}/go_cxx_wrap"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "CC=${workpath}/go_cc_wrap" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXX=${workpath}/go_cxx_wrap" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "OBJC=${workpath}/go_objc_wrap" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "OBJCXX=${workpath}/go_objcxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</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;'>- "BOOT_GO_LDFLAGS=-extldflags='${configure.ldflags}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append ${build.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env-append ${build.env}
</span> }
port::register_callback go.append_env
</pre><pre style='margin:0'>
</pre>