<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87091e9f8382b9df803caef2e5aef0ee67ce551b">https://github.com/macports/macports-ports/commit/87091e9f8382b9df803caef2e5aef0ee67ce551b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 87091e9f8382b9df803caef2e5aef0ee67ce551b
</span>Author: Michael Lass <michael.lass@uni-paderborn.de>
AuthorDate: Thu Dec 20 22:18:19 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> atom: unconditionally set MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Unify this port among different macOS versions by always setting
</span><span style='display:block; white-space:pre;color:#404040;'> MACOSX_DEPLOYMENT_TARGET to the value provided by macports.
</span>---
editors/atom/Portfile | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/atom/Portfile b/editors/atom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba5b027..b6b925a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/atom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/atom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,25 +24,22 @@ depends_lib-append path:bin/npm:npm5 \
</span> port:git \
port:python27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd script/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON="${prefix}/bin/python2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} > 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure the compiler builds against libc++ for macOS 10.14 and newer (#57243)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.cflags} -mmacosx-version-min=10.9" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} -mmacosx-version-min=10.9" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} -mmacosx-version-min=10.9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target-delete all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append --ci
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# atom does not use configure but a custom build script. Additionally, node (or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# some of the packages) seem to override MACOSX_DEPLOYMENT_TARGET. This has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# caused issues at least once (#57243) so explicitly set it here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd script/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append "-mmacosx-version-min=${macosx_deployment_target}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append "-mmacosx-version-min=${macosx_deployment_target}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append "-mmacosx-version-min=${macosx_deployment_target}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON="${prefix}/bin/python2.7" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target-delete all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --ci
</span>
universal_variant no
</pre><pre style='margin:0'>
</pre>