<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b8e334cbabf1abf9567418be53bbf30853aa748">https://github.com/macports/macports-ports/commit/8b8e334cbabf1abf9567418be53bbf30853aa748</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8b8e334cbabf1abf9567418be53bbf30853aa748
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Fri Sep 29 05:17:45 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: simplify incorporation of configure.cxx_stdlib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since resultant build is the same.
</span>---
aqua/qt5/Portfile | 16 +++-------------
aqua/qt55/Portfile | 16 +++-------------
aqua/qt56/Portfile | 16 +++-------------
aqua/qt57/Portfile | 16 +++-------------
4 files changed, 12 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c7832c..0fc031d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,18 +806,8 @@ foreach {module module_info} [array get modules] {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib ${cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++ -D_GLIBCXX_USE_CXX11_ABI=0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${configure.cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1002,8 +992,8 @@ foreach {module module_info} [array get modules] {
</span> # Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portconfigure::should_add_stdlib {} {return false}
</span> configure.sdkroot
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc3d891..a4dbf0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -724,18 +724,8 @@ foreach {module module_info} [array get modules] {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib ${cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++ -D_GLIBCXX_USE_CXX11_ABI=0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${configure.cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -915,8 +905,8 @@ foreach {module module_info} [array get modules] {
</span> # Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portconfigure::should_add_stdlib {} {return false}
</span> configure.sdkroot
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 951c90f..8fec3bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -750,18 +750,8 @@ foreach {module module_info} [array get modules] {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib ${cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++ -D_GLIBCXX_USE_CXX11_ABI=0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${configure.cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -944,8 +934,8 @@ foreach {module module_info} [array get modules] {
</span> # Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portconfigure::should_add_stdlib {} {return false}
</span> configure.sdkroot
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71fcd07..1686156 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -801,18 +801,8 @@ foreach {module module_info} [array get modules] {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib ${cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++ -D_GLIBCXX_USE_CXX11_ABI=0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set replace_cxx_stdlib "macports-libstdc++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_CXX_STDLIB__|${configure.cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -995,8 +985,8 @@ foreach {module module_info} [array get modules] {
</span> # Qt builds part of the system using environment provided my MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc portconfigure::should_add_stdlib {} {return false}
</span> configure.sdkroot
configure.cc_archflags
configure.cxx_archflags
</pre><pre style='margin:0'>
</pre>