<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/bd40c7e8357ba58eab193fd0abf1494ae54a49fb">https://github.com/macports/macports-ports/commit/bd40c7e8357ba58eab193fd0abf1494ae54a49fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bd40c7e8357ba58eab193fd0abf1494ae54a49fb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Apr 4 15:14:17 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> qmake5 PG: ensure QMAKE_APPLE_DEVICE_ARCHS is set
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> QMAKE_APPLE_DEVICE_ARCHS should never be empty.
</span><span style='display:block; white-space:pre;color:#404040;'> However, when building documentation, QMAKE_APPLE_DEVICE_ARCHS
</span><span style='display:block; white-space:pre;color:#404040;'> needs to exist even if it is not actually needed.
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<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 8a6c361cacc..b4639a76c99 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;'>@@ -81,8 +81,13 @@ pre-configure {
</span> if {[vercmp ${qt5.version} 5.9] >= 0} {
if {[variant_exists universal] && [variant_isset universal]} {
puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${configure.universal_archs}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${configure.build_arch} ne "" } {
</span> puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${configure.build_arch}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If `supported_archs` is `noarch`, `configure.build_arch` can be empty (see e.g. qt5-qtbase-docs).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Having an empty QMAKE_APPLE_DEVICE_ARCHS can cause an error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Even if it is not really needed, not having a QMAKE_APPLE_DEVICE_ARCHS at all can also cause an error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "QMAKE_APPLE_DEVICE_ARCHS=${build_arch}"
</span> }
} else {
#
</pre><pre style='margin:0'>
</pre>