<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/57b34213865ed6dd99e22c61f3721232ffccf2f9">https://github.com/macports/macports-ports/commit/57b34213865ed6dd99e22c61f3721232ffccf2f9</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 57b3421 clang-3.4 and 3.7: remove libxml2 dependency
</span>57b3421 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 57b34213865ed6dd99e22c61f3721232ffccf2f9
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Jan 26 10:26:34 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> clang-3.4 and 3.7: remove libxml2 dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> to simplify bootstrapping
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libxml2 is optionally used, only by c-index-test
</span><span style='display:block; white-space:pre;color:#404040;'> it is not required, and is opportunistically linked in if found
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> port:libxml2 now uses port:icu, which requires c++11
</span><span style='display:block; white-space:pre;color:#404040;'> this generates bootstrapping hassles that are unnecessary
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove the dependency on libxml2 and force it to be ignored if
</span><span style='display:block; white-space:pre;color:#404040;'> opportunistically found.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> revbump to generate consistent buildbot builds of clang-3.4 and 3.7
</span><span style='display:block; white-space:pre;color:#404040;'> that do not require libxml2
</span>---
lang/llvm-3.4/Portfile | 14 +++++++++++---
lang/llvm-3.7/Portfile | 12 +++++++++++-
2 files changed, 22 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/Portfile b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bca8138..32638d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ set llvm_version 3.4
</span> set llvm_version_no_dot 34
name llvm-${llvm_version}
revision 12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 12 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 13 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
# prefix for deps using libstdc++ on a libc++ system
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,16 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> if {${os.major} >= 11} {
default_variants +analyzer
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port:libxml2 depends on port:icu which now needs a C++11 compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this is problematic for bootstrapping, and clang in fact does not require libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (although c-index-test will optionally use it if it is installed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the dependency, and force any installed version of libxml2 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # be ignored during configuration for consistent building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append ac_cv_lib_xml2_xmlReadFile=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${os.platform} eq "darwin" && ${os.major} < 12 && ${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +81,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 12 && ${cxx_stdlib} eq "libc++"}
</span> depends_lib-replace port:python27 port:python27-bootstrap \
port:ncurses port:ncurses-bootstrap
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # libxml2 depends on icu which needs a C++11 compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:libxml2 port:libxml2-bootstrap
</span> configure.cppflags-prepend -I${bootstrap_prefix}/include
configure.ldflags-prepend -L${bootstrap_prefix}/lib
configure.env-append PATH=${bootstrap_prefix}/bin:$::env(PATH)
<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 2675cf3..b5ea903 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;'>@@ -17,7 +17,7 @@ set llvm_version 3.7
</span> set llvm_version_no_dot 37
name llvm-${llvm_version}
revision 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 5 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 6 }
</span> set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +66,16 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> if {${os.major} >= 11} {
default_variants +analyzer
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port:libxml2 depends on port:icu which now needs a C++11 compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this is problematic for bootstrapping, and clang in fact does not require libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (although c-index-test will optionally use it if it is installed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the dependency, and force any installed version of libxml2 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # be ignored during configuration for consistent building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append ac_cv_lib_xml2_xmlReadFile=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
#fetch.type svn
</pre><pre style='margin:0'>
</pre>