<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/ac81c5875a9e7f770e68e81efa2adc1ee9f19113">https://github.com/macports/macports-ports/commit/ac81c5875a9e7f770e68e81efa2adc1ee9f19113</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 ac81c58 qmake5 PG: allow Portfile to not specify spec file
</span>ac81c58 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ac81c5875a9e7f770e68e81efa2adc1ee9f19113
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 12:54:28 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5 PG: allow Portfile to not specify spec file
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 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 80d6a4c..3c8c3d4 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,6 +37,9 @@
</span> PortGroup qt5 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt5.add_spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt5.add_spec yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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)
configure.cmd ${qt_qmake_cmd}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,8 +62,10 @@ pre-configure {
</span>
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;'>+ if { [tbool qt5.add_spec] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) -spec ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) -spec ${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
foreach arch ${configure.universal_archs} {
lappend merger_configure_args(${arch}) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +80,9 @@ pre-configure {
</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;'>+ if { [tbool qt5.add_spec] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -spec ${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
configure.args-append \
QT_ARCH=${build_arch} \
</pre><pre style='margin:0'>
</pre>