<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/64c96ff75887237c7c30531f7a76d4a18ca688a5">https://github.com/macports/macports-ports/commit/64c96ff75887237c7c30531f7a76d4a18ca688a5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 64c96ff75887237c7c30531f7a76d4a18ca688a5
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Jun 22 13:13:22 2019 +0100

<span style='display:block; white-space:pre;color:#404040;'>    bazel: Update build file patching to not rely on hardcoded paths
</span>---
 devel/bazel/Portfile | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazel/Portfile b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d69ef6..ea6c83f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,21 +172,16 @@ build {
</span>         return -code error "build error"
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[vercmp ${xcodeversion} ${bazel_min_xcode}] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Patch build files to enforce correct compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach f { scripts/bootstrap/compile.sh tools/osx/crosstool/CROSSTOOL.tpl src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL tools/cpp/unix_cc_configure.bzl tools/cpp/CROSSTOOL third_party/zlib/configure src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL tools/cpp/cc_toolchain_config.bzl tools/osx/crosstool/cc_toolchain_config.bzl.tpl } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set ff ${worksrcpath}/${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[file exists ${ff}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                foreach cmd {ar nm strip libtool ld objdump} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace -q "s|/usr/bin/${cmd}|${prefix}/bin/${cmd}|g" ${ff}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -q "s|/usr/bin/clang|${configure.cc}|g"       ${ff}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -q "s|\"clang\"|\"${configure.cc}\"|g"        ${ff}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -q "s| clang | ${configure.cc} |g"            ${ff}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -q "s|/usr/local/include|${prefix}/include|g" ${ff}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -q "s|std=c++0x|std=c++11|g"                  ${ff}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Patch build files to enforce correct compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach f [ exec find ${worksrcpath} -name "configure" -or -name "configure.py" -or -name "compile.sh" -or -name "*.tpl" -or -name "*.bzl" -or -name "CROSSTOOL" -or -name "configure.py" -or -name "MOCK_CROSSTOOL" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach cmd {ar nm strip libtool ld objdump} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace -q "s|/usr/bin/${cmd}|${prefix}/bin/${cmd}|g" ${f}
</span>         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s|/usr/bin/clang|${configure.cc}|g"       ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s|\"clang\"|\"${configure.cc}\"|g"        ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s| clang | ${configure.cc} |g"            ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s|/usr/local/include|${prefix}/include|g" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s|std=c++0x|std=c++11|g"                  ${f}
</span>     }
 
     # Build bazel
</pre><pre style='margin:0'>

</pre>