<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/33d78f3f62bd4d24b170d86ce007ac2844b1236c">https://github.com/macports/macports-ports/commit/33d78f3f62bd4d24b170d86ce007ac2844b1236c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 33d78f3f62bd4d24b170d86ce007ac2844b1236c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Oct 12 10:53:16 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtbase: respect configure.optflags
</span>---
aqua/qt5/Portfile | 9 +++++++--
aqua/qt5/files/patch-mkspecs.diff | 11 +++++++++++
aqua/qt55/Portfile | 11 ++++++++---
aqua/qt55/files/patch-mkspecs.diff | 11 +++++++++++
aqua/qt56/Portfile | 11 ++++++++---
aqua/qt56/files/patch-mkspecs.diff | 11 +++++++++++
aqua/qt57/Portfile | 11 ++++++++---
aqua/qt57/files/patch-mkspecs.diff | 11 +++++++++++
aqua/qt58/Portfile | 11 ++++++++---
aqua/qt58/files/patch-mkspecs.diff | 11 +++++++++++
10 files changed, 94 insertions(+), 14 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 3e4b712..f435119 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;'>@@ -140,7 +140,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -849,6 +849,11 @@ foreach {module module_info} [array get modules] {
</span> "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
${worksrcpath}/mkspecs/${spec}/qmake.conf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #respect configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_OPTFLAGS__|${configure.optflags}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/gcc-base.conf
</span> }
if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -893,7 +898,7 @@ foreach {module module_info} [array get modules] {
</span>
# return modified spec files to the default values
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}/mkspecs-save/common/${conf} ${worksrcpath}/mkspecs/common/${conf}
}
foreach spec {macx-clang macx-g++ macx-icc} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-mkspecs.diff b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 11bb28e..2cc69f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,3 +77,14 @@
</span> QMAKE_AR_LTCG = libtool -static -o
QMAKE_CFLAGS_APPLICATION_EXTENSION = -fapplication-extension
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base.conf.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base.conf 2017-10-12 09:42:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE = -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS_OPTIMIZE_SIZE = __MACPORTS_OPTFLAGS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -pipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_DEPS += -M
</span><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 b554640..43f8ccf 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;'>@@ -143,7 +143,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 9"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 10"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -738,6 +738,11 @@ foreach {module module_info} [array get modules] {
</span> "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
${worksrcpath}/mkspecs/${spec}/qmake.conf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #respect configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_OPTFLAGS__|${configure.optflags}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/gcc-base.conf
</span> }
if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -761,7 +766,7 @@ foreach {module module_info} [array get modules] {
</span> post-build {
if { [variant_exists universal] && [variant_isset universal] } {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}-${arch}/mkspecs-save/common/${conf} ${worksrcpath}-${arch}/mkspecs/common/${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;'>@@ -769,7 +774,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}/mkspecs-save/common/${conf} ${worksrcpath}/mkspecs/common/${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;color:#808080;'>diff --git a/aqua/qt55/files/patch-mkspecs.diff b/aqua/qt55/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 920ea7c..f91cdeb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,3 +127,14 @@
</span> +QMAKE_LFLAGS_CXX11 += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base.conf 2017-10-12 10:22:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # you can use the manual test in tests/manual/mkspecs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS_OPTIMIZE = -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS_OPTIMIZE = __MACPORTS_OPTFLAGS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -pipe
</span><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 e8ba643..8d6943a 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;'>@@ -149,7 +149,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -776,6 +776,11 @@ foreach {module module_info} [array get modules] {
</span> "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
${worksrcpath}/mkspecs/${spec}/qmake.conf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #respect configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_OPTFLAGS__|${configure.optflags}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/gcc-base.conf
</span> }
if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -799,7 +804,7 @@ foreach {module module_info} [array get modules] {
</span> post-build {
if { [variant_exists universal] && [variant_isset universal] } {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}-${arch}/mkspecs-save/common/${conf} ${worksrcpath}-${arch}/mkspecs/common/${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;'>@@ -807,7 +812,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}/mkspecs-save/common/${conf} ${worksrcpath}/mkspecs/common/${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;color:#808080;'>diff --git a/aqua/qt56/files/patch-mkspecs.diff b/aqua/qt56/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 808dd09..11cbbac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,3 +125,14 @@
</span> -QMAKE_LFLAGS += -stdlib=libc++
+QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base.conf.orig 2017-10-12 10:37:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base.conf 2017-10-12 10:38:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # you can use the manual test in tests/manual/mkspecs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS_OPTIMIZE = -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS_OPTIMIZE = __MACPORTS_OPTFLAGS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -pipe
</span><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 645210b..5d3f47b 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;'>@@ -149,7 +149,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -827,6 +827,11 @@ foreach {module module_info} [array get modules] {
</span> "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
${worksrcpath}/mkspecs/${spec}/qmake.conf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #respect configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_OPTFLAGS__|${configure.optflags}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/gcc-base.conf
</span> }
if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -850,7 +855,7 @@ foreach {module module_info} [array get modules] {
</span> post-build {
if { [variant_exists universal] && [variant_isset universal] } {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}-${arch}/mkspecs-save/common/${conf} ${worksrcpath}-${arch}/mkspecs/common/${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;'>@@ -858,7 +863,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}/mkspecs-save/common/${conf} ${worksrcpath}/mkspecs/common/${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;color:#808080;'>diff --git a/aqua/qt57/files/patch-mkspecs.diff b/aqua/qt57/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c4aea8..4840fe2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,3 +125,14 @@
</span> -QMAKE_LFLAGS += -stdlib=libc++
+QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base.conf.orig 2017-10-12 10:44:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base.conf 2017-10-12 10:44:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # you can use the manual test in tests/manual/mkspecs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS_OPTIMIZE = -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS_OPTIMIZE = __MACPORTS_OPTFLAGS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -pipe
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e74381..a87f765 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -840,6 +840,11 @@ foreach {module module_info} [array get modules] {
</span> "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
${worksrcpath}/mkspecs/${spec}/qmake.conf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #respect configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_OPTFLAGS__|${configure.optflags}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/gcc-base.conf
</span> }
if { [vercmp ${xcodeversion} "7.0"] >= 0 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -870,7 +875,7 @@ foreach {module module_info} [array get modules] {
</span> post-build {
if { [variant_exists universal] && [variant_isset universal] } {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}-${arch}/mkspecs-save/common/${conf} ${worksrcpath}-${arch}/mkspecs/common/${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;'>@@ -878,7 +883,7 @@ foreach {module module_info} [array get modules] {
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach conf {clang.conf macx.conf clang-mac.conf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach conf {clang.conf macx.conf clang-mac.conf gcc-base.conf} {
</span> move -force ${worksrcpath}/mkspecs-save/common/${conf} ${worksrcpath}/mkspecs/common/${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;color:#808080;'>diff --git a/aqua/qt58/files/patch-mkspecs.diff b/aqua/qt58/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 52000af..6ecb2c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,3 +126,14 @@
</span> +QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
QMAKE_AR_LTCG = libtool -static -o
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/gcc-base.conf.orig 2017-10-12 10:45:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/gcc-base.conf 2017-10-12 10:46:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # you can use the manual test in tests/manual/mkspecs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS_OPTIMIZE = -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS_OPTIMIZE = __MACPORTS_OPTFLAGS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -pipe
</span></pre><pre style='margin:0'>
</pre>