<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/a199b650b0bfbb37d57854848ab8b168c5f7bef2">https://github.com/macports/macports-ports/commit/a199b650b0bfbb37d57854848ab8b168c5f7bef2</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 a199b65 root6: remove unneccessary options
</span>a199b65 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a199b650b0bfbb37d57854848ab8b168c5f7bef2
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Nov 12 22:36:44 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> root6: remove unneccessary options
</span>---
science/root6/Portfile | 19 +------------------
1 file changed, 1 insertion(+), 18 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 577383d..c777fd9 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,26 +196,8 @@ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set isysroot on 10.14 (Darwin18) and newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} > 17 && ${configure.sdkroot} ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_OSX_SYSROOT=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # No longer sure why this is done.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Retain for macOS 10.13 and older but turn off for 10.14+
</span><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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Force use of system python in build scripts
# Find command finds text files containing the string to be replaced.
# shtest-encoding.py intentionally includes an unreadable character, so have to skip it ...
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,6 +206,7 @@ platform darwin {
</span> reinplace -q "s|${pystringtoreplace}|/usr/bin/python|g" $f
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>