<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd34287c99ab9372baca32bb78b8471b94780764">https://github.com/macports/macports-ports/commit/bd34287c99ab9372baca32bb78b8471b94780764</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 bd34287 icu: avoid circular dependencies on older systems
</span>bd34287 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd34287c99ab9372baca32bb78b8471b94780764
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Oct 26 07:35:17 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu: avoid circular dependencies on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix ICU circular dependencies on Mac OS X 10.6 and 10.7.
</span>---
_resources/port1.0/group/clang_dependency-1.0.tcl | 4 +---
devel/icu/Portfile | 2 +-
devel/libunwind/Portfile | 17 +++++++++--------
lang/libcxx/Portfile | 4 ++--
lang/llvm-3.4/Portfile | 17 ++++++++++-------
5 files changed, 23 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/clang_dependency-1.0.tcl b/_resources/port1.0/group/clang_dependency-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6135699..6a8779f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/clang_dependency-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/clang_dependency-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,9 +8,7 @@
</span> proc clang_dependency.extra_versions {versions} {
global prefix
foreach ver $versions {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/bin/clang-mp-${ver}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append macports-clang-${ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append macports-clang-${ver}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 55e8e0a..dae608b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ subport ${name}-bootstrap {
</span> compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
}
# Also needed by later clangs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 12 && ${cxx_stdlib} eq "libc++"} {
</span> clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libunwind/Portfile b/devel/libunwind/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d97a88..188f40c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libunwind/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libunwind/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,14 +49,7 @@ destroot.dir ${build.dir}
</span> if {${subport} eq "${name}-headers"} {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target installhdrs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # please keep this test *before* `supported_archs noarch`, which clears `configure.cxx_stdlib`
</span> if {${os.platform} eq "darwin" && ${os.major} < 11 && ${configure.cxx_stdlib} eq "libc++"} {
# This port is used by clang-3.4 to bootstrap libcxx, which is
# indirectly used by the normal xz port.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +59,14 @@ if {${subport} eq "${name}-headers"} {
</span> extract.cmd ${prefix}/libexec/libcxx-bootstrap/bin/xz
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target installhdrs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Having the stdlib set to libc++ on 10.6 causes a macports-clang
# compiler to be selected.
configure.cxx_stdlib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libcxx/Portfile b/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5890f6b..bba2f19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span>
# only selected clang versions support emulated_tls, and the emulated_tls variant
# needs to be enabled to build libcxx with emulated_tls support
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach ver {5.0 6.0 7.0 8.0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach ver {5.0 6.0 7.0 8.0 9.0} {
</span> if {[file exists ${prefix}/bin/clang-mp-${ver}]} {
if {[active_variants clang-${ver} emulated_tls]} {
default_variants-append +emulated_tls
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +102,7 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span> compiler.blacklist *gcc* {clang < 500}
# clang 3.5 and newer are conditionally blacklisted to prevent dependency cycles
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach ver {3.5 3.6 3.7 3.8 3.9 4.0 5.0 6.0 7.0 8.0 devel} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach ver {3.5 3.6 3.7 3.8 3.9 4.0 5.0 6.0 7.0 8.0 9.0 devel} {
</span> if {![file exists ${prefix}/bin/clang-mp-${ver}]} {
compiler.blacklist-append macports-clang-${ver}
}
<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 3fa35d0..f42b2a4 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;'>@@ -63,13 +63,16 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Have to also use bootstrap versions of deps that use libstdc++ in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # order to be able to build libc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:libxml2 port:libxml2-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 port:python27-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses port:ncurses-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 12 && ${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Have to also use bootstrap versions of deps that use libstdc++ in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # order to be able to build libc++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:python27 port:python27-bootstrap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses port:ncurses-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libxml2 depends on icu which needs a C++11 compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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)
</pre><pre style='margin:0'>
</pre>