<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61673eefe33fe98ffd318b48675a8d9cf5484d28">https://github.com/macports/macports-ports/commit/61673eefe33fe98ffd318b48675a8d9cf5484d28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 61673eefe33fe98ffd318b48675a8d9cf5484d28
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 23:12:08 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: use code from qmake5 PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since there is no behavioral change.
</span>---
python/py-pyqt5/Portfile | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1909f5..eee2f08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ checksums rmd160 d103fd1e27b8591893b55f56eb0d306767569e2b \
</span> python.versions 27 34 35 36
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span>
# pull in the Qt5 meta-port
qt5.depends_component \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,18 +60,6 @@ if {${name} ne ${subport}} {
</span> destroot.cmd ${build.cmd}
destroot.destdir DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # override QMAKE_MACOSX_DEPLOYMENT_TARGET set in ${prefix}/libexec/qt5/mkspecs/macx-clang/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # override C++ flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so value of ${configure.cxx_stdlib} can always be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS-=-stdlib=libc++ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LFLAGS-=-stdlib=libc++ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant debug description "Build debug libraries" {
configure.cmd-append --debug
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,10 +83,10 @@ if {${name} ne ${subport}} {
</span> patchfiles-append patch-no-abort-on-python-errors.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.add_spec no
</span> if { ![variant_isset universal] } {
configure.args-append "--spec=${qt_qmake_spec}"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args-delete --disable-dependency-tracking
</span> set merger_configure_args(i386) "--spec=${qt_qmake_spec_32}"
set merger_configure_args(x86_64) "--spec=${qt_qmake_spec_64}"
}
</pre><pre style='margin:0'>
</pre>