<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/7a15ed2d073f57826032e7abd1cb3cef36f2e152">https://github.com/macports/macports-ports/commit/7a15ed2d073f57826032e7abd1cb3cef36f2e152</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 7a15ed2 clang-5+: repair analyzer variant toggle
</span>7a15ed2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7a15ed2d073f57826032e7abd1cb3cef36f2e152
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Jan 30 15:24:39 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> clang-5+: repair analyzer variant toggle
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> toggling analyzer variant OFF has caused failed builds
</span><span style='display:block; white-space:pre;color:#404040;'> since the transition to CMAKE due to a need to also toggle
</span><span style='display:block; white-space:pre;color:#404040;'> CLANG_ENABLE_ARCMT in sync with the static analyzer
</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/60027
</span>---
lang/llvm-5.0/Portfile | 10 ++++++----
lang/llvm-6.0/Portfile | 10 ++++++----
lang/llvm-7.0/Portfile | 10 ++++++----
lang/llvm-8.0/Portfile | 10 ++++++----
lang/llvm-9.0/Portfile | 10 ++++++----
lang/llvm-devel/Portfile | 10 ++++++----
6 files changed, 36 insertions(+), 24 deletions(-)
<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 31b478f..9abaaf8 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;'>@@ -261,6 +261,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCMAKE_LINKER=${prefix}/bin/ld \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -572,10 +573,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
variant analyzer description {Install clang static analyzer} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these have to be switched on or off together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=ON
</span>
depends_run-append port:perl5
<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 edc1b20..a49eedb 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;'>@@ -250,6 +250,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCMAKE_LINKER=${prefix}/bin/ld \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -562,10 +563,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
variant analyzer description {Install clang static analyzer} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these have to be switched on or off together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=ON
</span>
depends_run-append port:perl5
<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 78b2006..226c4a6 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;'>@@ -249,6 +249,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCMAKE_LINKER=${prefix}/bin/ld \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -586,10 +587,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
variant analyzer description {Install clang static analyzer} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these have to be switched on or off together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=ON
</span>
depends_run-append port:perl5
<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 448ad2a..6ba7d3c 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;'>@@ -261,6 +261,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCMAKE_LINKER=${prefix}/bin/ld \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,10 +599,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
variant analyzer description {Install clang static analyzer} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these have to be switched on or off together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=ON
</span>
depends_run-append port:perl5
<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 2502d04..591e1e1 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;'>@@ -265,6 +265,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCMAKE_LINKER=${prefix}/bin/ld \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,10 +615,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
variant analyzer description {Install clang static analyzer} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these have to be switched on or off together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=ON
</span>
depends_run-append port:perl5
<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 6e327b9..2374037 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;'>@@ -229,6 +229,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DCMAKE_LINKER=${prefix}/bin/ld \
-DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=OFF \
</span> -DDARWIN_PREFER_PUBLIC_SDK=ON \
-DLLVM_BUILD_RUNTIME=ON \
-DLIBCXX_ENABLE_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -573,10 +574,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
variant analyzer description {Install clang static analyzer} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these have to be switched on or off together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_STATIC_ANALYZER=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCLANG_ENABLE_ARCMT=ON
</span>
depends_run-append port:perl5
</pre><pre style='margin:0'>
</pre>