<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eee0bf9f7a9775e5749fe9ab669d3136709bd1d0">https://github.com/macports/macports-ports/commit/eee0bf9f7a9775e5749fe9ab669d3136709bd1d0</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 eee0bf9f7a9 traefik: run go generate and go build steps in a single script so that both run with environment variables from `build.env`
</span>eee0bf9f7a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eee0bf9f7a9775e5749fe9ab669d3136709bd1d0
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed Aug 18 10:16:49 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> traefik: run go generate and go build steps in a single script so that both run with environment variables from `build.env`
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> traefik's "go generate" step was being run as a separate command using `system`,
</span><span style='display:block; white-space:pre;color:#404040;'> which meant that "go generate" was not getting environment variables set in
</span><span style='display:block; white-space:pre;color:#404040;'> `build.env`. As a result, "go generate" failed to build in older versions of
</span><span style='display:block; white-space:pre;color:#404040;'> macOS since the legacysupport compiler wrapper that enables building in these
</span><span style='display:block; white-space:pre;color:#404040;'> environments exposes compiler options in `build.env`.
</span>---
net/traefik/Portfile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/traefik/Portfile b/net/traefik/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6578149074f..c81a2841b6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/traefik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/traefik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,16 +26,21 @@ checksums rmd160 240a87cb7bc5299fd360ba7ca6e25b730b55485b \
</span> depends_build-append \
port:go-bindata
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${go.bin} generate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build_sh ${worksrcpath}/build.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bfile [open ${build_sh} w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${bfile} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${bfile} "${go.bin} generate && ${go.bin} build -ldflags '-X ${go.package}/v2/pkg/version.Version=${version}' ./cmd/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${bfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${build_sh} -permissions 0755
</span> }
# FIXME: This port currently can't be built without allowing go mod to fetch
build.env-delete GOPROXY=off GO111MODULE=off
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -ldflags '-X ${go.package}/v2/pkg/version.Version=${version}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args ./cmd/traefik
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${build_sh}
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</pre><pre style='margin:0'>
</pre>