<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/a0b8e0709452f1994390c02befc2f6b0f8d79029">https://github.com/macports/macports-ports/commit/a0b8e0709452f1994390c02befc2f6b0f8d79029</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a0b8e0709452f1994390c02befc2f6b0f8d79029
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Mar 10 13:00:40 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> bazel: Use MP toolchain on macOS10.14 and older
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62415
</span>---
devel/bazel/Portfile | 42 ++++++++++++++++++++++++++++--------------
1 file changed, 28 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 3b80ff44f8d..4ef3cd2a19c 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;'>@@ -24,6 +24,10 @@ foreach b [lsearch -inline -all -not -exact $all_bazels ${subport}] {
</span> # Min supported Darwin version
set min_darwin 16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The oldest Xcode version to use default Xcode compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note setting here should be in sync with that in py-tensorflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bazel_min_xcode 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${name} eq ${subport} } {
# Main port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +38,10 @@ if { ${name} eq ${subport} } {
</span> sha256 d350f80e70654932db252db380d2ec0144a00e86f8d9f2b4c799ffdb48e9cdd1 \
size 274505338
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_min_xcode 12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 1200}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {macports-clang-[5-9].0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif { "bazel-3.7" eq ${subport} } {
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +55,9 @@ if { ${name} eq ${subport} } {
</span> sha256 de255bb42163a915312df9f4b86e5b874b46d9e8d4b72604b5123c3a845ed9b1 \
size 313677756
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif { "bazel-3.5" eq ${subport} } {
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +71,9 @@ if { ${name} eq ${subport} } {
</span> sha256 67eae714578b22d24192b0eb3a2d35b07578bbd57a33c50f1e74f8acd6378b3c \
size 307982168
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif { "bazel-2.0" eq ${subport} } {
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +87,9 @@ if { ${name} eq ${subport} } {
</span> sha256 724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb \
size 259625808
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif { "bazel-0.25" eq ${subport} } {
# Specific version for py-tensorflow1 - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +105,8 @@ if { ${name} eq ${subport} } {
</span>
# min OS
set min_darwin 14
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {macports-clang-[7-9].0}
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,23 +151,11 @@ use_configure no
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The oldest Xcode version to use default Xcode compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note setting here should be in sync with that in py-tensorflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set bazel_min_xcode 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Even though bazel can build without Xcode, mark use Xcode for now since it fails to
# build with tracemode on latest master if both CLT and Xcode are available.
# Better solution is to respect MacPorts environment configure.developer_dir
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Blacklist too old system compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clang 7, 8 and 9 fail with missing libarclite on older systems (e.g. 10.10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ../usr/bin/xcrun /opt/local/bin/clang-mp-8.0 -fobjc-arc -framework CoreServices -framework Foundation -o /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_devel_bazel/bazel26/work/.tmp/bazel_4sKHinCP/archive/_embedded_binaries/xcode-locator tools/osx/xcode_locator.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ld: file not found: /opt/local/libexec/llvm-8.0/lib/arc/libarclite_macosx.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2011
# python versions. Build needs both 'python2' and 'python3'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,7 +220,8 @@ set use_mp_clang [ expr ( [ string match macports-clang-* ${configure.compiler}
</span> # Disable Xcode detection on older OSes, as we want the
# MP provided commandline utilities to be used instead.
if { ${use_mp_clang} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
</span> }
variant bash_completion {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,7 +242,13 @@ build {
</span> }
# Build bazel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "PATH=${workpath}/bin:\$PATH JAVA_HOME=${java.home} VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_cmd "PATH=${workpath}/bin:\$PATH JAVA_HOME=${java.home} VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If using MP toolchain pass options to enforce this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${use_mp_clang} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_cmd "EXTRA_BAZEL_ARGS='--action_env CC=${configure.cc}' ${bazel_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_cmd "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${bazel_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${bazel_cmd}"
</span>
# Put executable in main working folder
xinstall -m 755 -W ${worksrcpath}/output ${name} ${worksrcpath}
</pre><pre style='margin:0'>
</pre>