<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70206c8dcaec0e73e04df6e09ff720b476a4ea2f">https://github.com/macports/macports-ports/commit/70206c8dcaec0e73e04df6e09ff720b476a4ea2f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 70206c8dcaec0e73e04df6e09ff720b476a4ea2f
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Wed Jan 3 15:42:46 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> clang-{4.0,5.0,devel}: Fix the path to clang in ClangTargets-${cmake.build_type}.cmake
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55630
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
lang/llvm-4.0/Portfile | 4 +++-
lang/llvm-5.0/Portfile | 4 +++-
lang/llvm-devel/Portfile | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-4.0/Portfile b/lang/llvm-4.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6354d48..6c5b7f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set clang_executable_version 4.0
</span> set lldb_executable_version 4.0.1
name llvm-${llvm_version}
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 5 }
</span> subport lldb-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,6 +443,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span>
delete ${destroot}${sub_prefix}/bin/clang
file rename ${destroot}${sub_prefix}/bin/clang-${clang_executable_version} ${destroot}${sub_prefix}/bin/clang
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/bin/clang-${clang_executable_version}|/bin/clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${destroot}${sub_prefix}/lib/cmake/clang/ClangTargets-release.cmake"
</span> }
}
<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 6096457..4fe6324 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;'>@@ -12,7 +12,7 @@ set llvm_version_no_dot 50
</span> set clang_executable_version 5.0
set lldb_executable_version 5.0.1
name llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 1 }
</span> subport lldb-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,6 +453,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span>
delete ${destroot}${sub_prefix}/bin/clang
file rename ${destroot}${sub_prefix}/bin/clang-${clang_executable_version} ${destroot}${sub_prefix}/bin/clang
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/bin/clang-${clang_executable_version}|/bin/clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${destroot}${sub_prefix}/lib/cmake/clang/ClangTargets-release.cmake"
</span> }
}
<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 5207613..0832ca9 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;'>@@ -12,7 +12,7 @@ set llvm_version_no_dot devel
</span> set clang_executable_version 6.0
set lldb_executable_version 6.0.0
name llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 1 }
</span> subport lldb-${llvm_version} {}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,6 +430,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span>
delete ${destroot}${sub_prefix}/bin/clang
file rename ${destroot}${sub_prefix}/bin/clang-${clang_executable_version} ${destroot}${sub_prefix}/bin/clang
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/bin/clang-${clang_executable_version}|/bin/clang|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${destroot}${sub_prefix}/lib/cmake/clang/ClangTargets-release.cmake"
</span> }
}
</pre><pre style='margin:0'>
</pre>