<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/3cb5fcb16aaebfffaf60db6263d2371a01c1d7c1">https://github.com/macports/macports-ports/commit/3cb5fcb16aaebfffaf60db6263d2371a01c1d7c1</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 3cb5fcb16aa mint: fix build for macOS 10.14 and 10.15
</span>3cb5fcb16aa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3cb5fcb16aaebfffaf60db6263d2371a01c1d7c1
</span>Author: Kyle Lanchman <k.lanchman@gmail.com>
AuthorDate: Fri Dec 3 00:31:38 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mint: fix build for macOS 10.14 and 10.15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> mint's Makefile assumes the --arch flag is available on the `swift
</span><span style='display:block; white-space:pre;color:#404040;'> build` command, which was added in Swift 5.3 / Xcode 12. This causes
</span><span style='display:block; white-space:pre;color:#404040;'> builds to fail on machines with an older version of Xcode, even if
</span><span style='display:block; white-space:pre;color:#404040;'> mint actually supports the Xcode version being used.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64099
</span>---
devel/mint/Portfile | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mint/Portfile b/devel/mint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e58808cd2d..285d6031dbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,10 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span>
github.setup yonaskolb Mint 0.17.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> github.tarball_from archive
name mint
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,21 +21,35 @@ checksums rmd160 9e5d01ecb931cb17d88e29c146ebf2a4ba77b463 \
</span> sha256 0e3ab23e548a752f6eee3a7b98d1c137a30371e4a0ec9212840baaa56741d2e4 \
size 23308
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+minimum_xcodeversions-append {18 10.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span> known_fail yes
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} requires macOS 10.15 or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} requires macOS 10.14 or later."
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Universal support enabled by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Universal support handled manually
</span> universal_variant no
use_configure no
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args PREFIX="${destroot}${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args --configuration release --disable-sandbox
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set builtproductdir ${worksrcpath}/.build/release
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Xcode 12 (Swift 5.3) adds the --arch flag, letting us make a universal build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Doing so changes the output directory of the product.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${xcodeversion} 12.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append --arch x86_64 --arch arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set builtproductdir ${worksrcpath}/.build/apple/Products/Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${builtproductdir}/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>