<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/971d5244067fb0433ca61d3141707aef41dfcd90">https://github.com/macports/macports-ports/commit/971d5244067fb0433ca61d3141707aef41dfcd90</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 971d5244067fb0433ca61d3141707aef41dfcd90
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Oct 1 06:28:16 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5 PG: allow Portfile to specify spec command
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 11 ++++++-----
devel/qscintilla2/Portfile | 12 +-----------
python/py-pyqt5/Portfile | 9 +--------
3 files changed, 8 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 99dc0a5..4ffdaff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,13 +37,14 @@
</span> PortGroup qt5 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options qt5.add_spec qt5.debug_variant qt5.top_level qt5.cxxflags qt5.ldflags qt5.frameworkpaths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt5.add_spec qt5.debug_variant qt5.top_level qt5.cxxflags qt5.ldflags qt5.frameworkpaths qt5.spec_cmd
</span> default qt5.add_spec yes
default qt5.debug_variant yes
default qt5.top_level {${configure.dir}}
default qt5.cxxflags {}
default qt5.ldflags {}
default qt5.frameworkpaths {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt5.spec_cmd {"-spec "}
</span>
# with the -r option, the examples do not install correctly (no source code)
# the install_sources target is not created in the Makefile(s)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,14 +60,14 @@ pre-configure {
</span> #
if { [tbool qt5.add_spec] } {
if {[vercmp ${qt5.version} 5.9]>=0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -spec ${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "${qt5.spec_cmd}${qt_qmake_spec}"
</span> } else {
if {[variant_exists universal] && [variant_isset universal]} {
global merger_configure_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) -spec ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) -spec ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval lappend merger_configure_args(i386) ${qt5.spec_cmd}${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval lappend merger_configure_args(x86_64) ${qt5.spec_cmd}${qt_qmake_spec_64}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -spec ${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "${qt5.spec_cmd}${qt_qmake_spec}"
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a77d44..2886585 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,17 +99,7 @@ foreach pver ${python_versions} {
</span> --qmake=${qt_qmake_cmd} \
--sip=${prefix}/bin/sip-${pbranch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.add_spec no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global merger_configure_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # specify build configuration (compiler, 32-bit/64-bit, etc.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --spec=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) --spec=${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) --spec=${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.spec_cmd --spec=
</span> }
}
<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 49078cc..cdaaa85 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;'>@@ -34,6 +34,7 @@ if {${name} ne ${subport}} {
</span> use_configure yes
configure.pre_args
configure.cmd "${python.bin} configure.py"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.spec_cmd --spec=
</span> configure.args-append \
-q ${qt_qmake_cmd} \
--verbose \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,14 +89,6 @@ if {${name} ne ${subport}} {
</span> patchfiles-append patch-no-abort-on-python-errors.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.add_spec no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "--spec=${qt_qmake_spec}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(i386) "--spec=${qt_qmake_spec_32}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(x86_64) "--spec=${qt_qmake_spec_64}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
} else {
livecheck.type regex
</pre><pre style='margin:0'>
</pre>