<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0a5a1cf9b1a094b6555e0b87eff2b257400fb8a3">https://github.com/macports/macports-ports/commit/0a5a1cf9b1a094b6555e0b87eff2b257400fb8a3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0a5a1cf9b1a094b6555e0b87eff2b257400fb8a3
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Apr 28 20:54:54 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-3.7 to 9.0 and devel: use system python 2.7 if available
</span>---
lang/llvm-3.7/Portfile | 16 +++++++++++++---
lang/llvm-5.0/Portfile | 28 +++++++++++++++++++++-------
lang/llvm-6.0/Portfile | 28 +++++++++++++++++++++-------
lang/llvm-7.0/Portfile | 28 +++++++++++++++++++++-------
lang/llvm-8.0/Portfile | 28 +++++++++++++++++++++-------
lang/llvm-9.0/Portfile | 26 +++++++++++++++-----------
lang/llvm-devel/Portfile | 26 +++++++++++++++-----------
7 files changed, 127 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/Portfile b/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 67a2fc1..6822096 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_build port:cctools
depends_skip_archcheck-append cctools ld64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,6 +204,16 @@ configure.args --enable-bindings=none --enable-libffi --enable-shared -
</span> --enable-debug-symbols --disable-debug-runtime \
--prefix="${sub_prefix}" --disable-assertions
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</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;'>+
</span> if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
select.file ${filespath}/mp-${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,7 +221,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> select.group clang
select.file ${filespath}/mp-${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python=${pythonfullpath}
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,7 +426,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/scan-view
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-5.0/Portfile b/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1c0731..b37c093 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +73,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> description the LLVM debugger
long_description Lldb is the "LLVM native" debugger.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:ncurses
</span> depends_build-append port:swig-python port:doxygen
# Clang doesn't actually use any of these, but the LLVM makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,9 +304,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=OFF
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,6 +350,23 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span> -DCMAKE_LIBTOOL=${prefix}/bin/libtool
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</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;'>+
</span> platform darwin {
# Note that we are forcing this choice. This means that anything linking
# against llvm-3.5 needs to also be using libc++. This is possibly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -593,7 +607,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-6.0/Portfile b/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e61ae61..1fd5381 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +73,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> description the LLVM debugger
long_description Lldb is the "LLVM native" debugger.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:ncurses
</span> depends_build-append port:swig-python port:doxygen
# Clang doesn't actually use any of these, but the LLVM makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,9 +294,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=OFF
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,6 +340,23 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span> -DCMAKE_LIBTOOL=${prefix}/bin/libtool
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</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;'>+
</span> platform darwin {
# Note that we are forcing this choice. This means that anything linking
# against llvm-3.5 needs to also be using libc++. This is possibly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -583,7 +597,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-7.0/Portfile b/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 030772f..8672042 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +73,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> description the LLVM debugger
long_description Lldb is the "LLVM native" debugger.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:ncurses
</span> depends_build-append port:swig-python port:doxygen
# Clang doesn't actually use any of these, but the LLVM makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,9 +299,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=OFF
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -348,6 +345,23 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span> -DCMAKE_LIBTOOL=${prefix}/bin/libtool
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</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;'>+
</span> platform darwin {
# Note that we are forcing this choice. This means that anything linking
# against llvm-3.5 needs to also be using libc++. This is possibly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -607,7 +621,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-8.0/Portfile b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3ec4f9..68a5b4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,8 +76,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> description the LLVM debugger
long_description Lldb is the "LLVM native" debugger.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:ncurses
</span> depends_build-append port:swig-python port:doxygen
# Clang doesn't actually use any of these, but the LLVM makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,9 +311,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=OFF
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,6 +357,23 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span> -DCMAKE_LIBTOOL=${prefix}/bin/libtool
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</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;'>+
</span> platform darwin {
# Note that we are forcing this choice. This means that anything linking
# against llvm-3.5 needs to also be using libc++. This is possibly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -619,7 +633,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-9.0/Portfile b/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3292a8..282ade7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +75,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> description the LLVM debugger
long_description Lldb is the "LLVM native" debugger.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:ncurses
</span> depends_build-append port:swig-python port:doxygen
# Clang doesn't actually use any of these, but the LLVM makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,9 +315,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=OFF
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,11 +363,18 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires a newer python than the system default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -638,7 +642,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c776558..23692ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> that can be built using the Clang frontend as a \
library to parse C/C++ code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version}
</span> depends_run port:clang_select port:ld64
depends_skip_archcheck-append ld64 subversion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +75,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> description the LLVM debugger
long_description Lldb is the "LLVM native" debugger.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libxml2 port:libomp port:llvm-${llvm_version} port:ncurses
</span> depends_build-append port:swig-python port:doxygen
# Clang doesn't actually use any of these, but the LLVM makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -280,9 +279,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBCXX_INSTALL_LIBRARY=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBCXX_INSTALL_LIBRARY=OFF
</span> }
# llvm-3.5 and later requires a C++11 runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,11 +328,18 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires a newer python than the system default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use the system python27 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/bin/python2.7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -594,7 +598,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${pythonfullpath}|g" \
</span> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
</pre><pre style='margin:0'>
</pre>