<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dee8ae3d44fda0b55dca4efa3c8aa276819315e3">https://github.com/macports/macports-ports/commit/dee8ae3d44fda0b55dca4efa3c8aa276819315e3</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 dee8ae3d44f bazel: add patch for 10.15 and earlier; disable ccache See: https://github.com/macports/macports-ports/pull/16149#issuecomment-1533818973
</span>dee8ae3d44f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit dee8ae3d44fda0b55dca4efa3c8aa276819315e3
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed May 3 19:04:24 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    bazel: add patch for 10.15 and earlier; disable ccache
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/macports/macports-ports/pull/16149#issuecomment-1533818973
</span>---
 devel/bazel/Portfile                              |  9 +++++++++
 devel/bazel/files/patch-tools-osx-build-arch.diff | 11 +++++++++++
 2 files changed, 20 insertions(+)

<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 7e457d46f7b..6252934235f 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;'>@@ -134,6 +134,13 @@ use_configure       no
</span> 
 patch.pre_args      -p1
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# By default, the Xcode Locator is built as arm64/x86_64.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For 10.15 and earlier, disable that behavior.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ui_info "Adding patch to disable dual arm64/x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-tools-osx-build-arch.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,6 +151,8 @@ compiler.cxx_standard 2011
</span> # Always force the use of the un-versioned SDK
 configure.sdk_version
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ccache    no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # python versions. Build needs both 'python2' and 'python3'
 set py3ver 3.10
 set py2ver 2.7
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazel/files/patch-tools-osx-build-arch.diff b/devel/bazel/files/patch-tools-osx-build-arch.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..94529ee03c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazel/files/patch-tools-osx-build-arch.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/osx/BUILD.orig 2023-05-03 17:34:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/osx/BUILD      2023-05-03 17:43:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      -framework Foundation -arch x86_64 -Wl,-no_uuid -o $@ $< && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   env -i codesign --identifier $@ --force --sign - $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>