<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/e967bb1325decd8d0c05f2f37b27067f6d780eb3">https://github.com/macports/macports-ports/commit/e967bb1325decd8d0c05f2f37b27067f6d780eb3</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 e967bb1 Fix building llibcxx bootstrap ports with 2.5.4
</span>e967bb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e967bb1325decd8d0c05f2f37b27067f6d780eb3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Aug 24 16:05:19 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> Fix building llibcxx bootstrap ports with 2.5.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Changing configure.cxx_stdlib isn't sufficient to change the compiler
</span><span style='display:block; white-space:pre;color:#404040;'> selection on MacPorts < 2.6.0, because users can be setting a fixed
</span><span style='display:block; white-space:pre;color:#404040;'> default_compilers list in macports.conf if they followed the
</span><span style='display:block; white-space:pre;color:#404040;'> LibcxxOnOlderSystems instructions.
</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/58876
</span>---
archivers/xz/Portfile | 1 +
devel/gettext/Portfile | 1 +
devel/gperf/Portfile | 1 +
devel/icu/Portfile | 1 +
devel/ncurses/Portfile | 1 +
devel/pkgconfig/Portfile | 1 +
lang/python27/Portfile | 1 +
textproc/libiconv/Portfile | 1 +
textproc/libxml2/Portfile | 1 +
9 files changed, 9 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xz/Portfile b/archivers/xz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f353210..ba44e90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/xz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/xz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> port:gettext port:gettext-bootstrap
# Avoid macports-clang dep (doesn't use C++ anyway)
configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
if {${cxx_stdlib} eq "libc++"} {
# This port is in the dependency chain for clang 3.7 and later
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/Portfile b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f4ba8ba..92a1be1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +56,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> depends_lib-replace port:libiconv port:libiconv-bootstrap \
port:ncurses port:ncurses-bootstrap
configure.cxx_stdlib libstdc++
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperf/Portfile b/devel/gperf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e58ba8..92c7bbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> subport ${name}-bootstrap {
prefix ${prefix}/libexec/libcxx-bootstrap
configure.cxx_stdlib libstdc++
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
<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 f3b451e..ab930b5 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;'>@@ -38,6 +38,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> subport ${name}-bootstrap {
prefix ${prefix}/libexec/libcxx-bootstrap
configure.cxx_stdlib libstdc++
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ncurses/Portfile b/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3266971..076ad46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> subport ${name}-bootstrap {
prefix ${prefix}/libexec/libcxx-bootstrap
configure.cxx_stdlib libstdc++
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/pkgconfig/Portfile b/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bfb8ee..c09f4d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> depends_lib-replace port:libiconv port:libiconv-bootstrap
# Avoid macports-clang dep (doesn't use C++ anyway)
configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/Portfile b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index edf3aa0..c98e672 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +66,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> configure.ldflags-append -L${stdprefix}/lib
configure.env-append PATH=${prefix}/bin:$::env(PATH)
configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> patchfiles-delete patch-libedit.diff
depends_build-replace port:pkgconfig port:pkgconfig-bootstrap
depends_lib-replace port:gettext port:gettext-bootstrap \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/Portfile b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78f9aa6..af6fb03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> depends_build-replace port:gperf port:gperf-bootstrap
# Avoid macports-clang dep (doesn't use C++ anyway)
configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/Portfile b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dec0b72..99111c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> depends_lib-replace port:libiconv port:libiconv-bootstrap \
port:icu port:icu-bootstrap \
port:xz port:xz-bootstrap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span> }
# Also needed by later clangs.
if {${cxx_stdlib} eq "libc++"} {
</pre><pre style='margin:0'>
</pre>