<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/20db282446976dfbc64f5197d014dbdef1b4018f">https://github.com/macports/macports-ports/commit/20db282446976dfbc64f5197d014dbdef1b4018f</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 20db282 root6: Set SYSROOT to SDK on macOS10.14 and newer
</span>20db282 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 20db282446976dfbc64f5197d014dbdef1b4018f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Nov 11 12:40:46 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: Set SYSROOT to SDK on macOS10.14 and newer
</span>---
science/root6/Portfile | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf73601..577383d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,16 +196,25 @@ platform darwin {
</span> configure.args-replace -Dbuiltin_tbb=ON -Dbuiltin_tbb=OFF
depends_lib-append port:tbb
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set isysroot on 10.14 (Darwin18) and newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} > 17 && ${configure.sdkroot} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_OSX_SYSROOT=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # replace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -DCMAKE_OSX_SYSROOT="/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -DCMAKE_OSX_DEPLOYMENT_TARGET=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-strsed "s|CMAKE_OSX_SYSROOT=\[^\[:blank:\]\]*|CMAKE_OSX_SYSROOT=\"/\"|"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-strsed "s|CMAKE_OSX_DEPLOYMENT_TARGET=\[^\[:blank:\]\]*|CMAKE_OSX_DEPLOYMENT_TARGET=\"\"|"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # No longer sure why this is done.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Retain for macOS 10.13 and older but turn off for 10.14+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # replace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DCMAKE_OSX_SYSROOT="/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DCMAKE_OSX_DEPLOYMENT_TARGET=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-strsed "s|CMAKE_OSX_SYSROOT=\[^\[:blank:\]\]*|CMAKE_OSX_SYSROOT=\"/\"|"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-strsed "s|CMAKE_OSX_DEPLOYMENT_TARGET=\[^\[:blank:\]\]*|CMAKE_OSX_DEPLOYMENT_TARGET=\"\"|"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# Force use of system python in build scripts
# Find command finds text files containing the string to be replaced.
</pre><pre style='margin:0'>
</pre>