<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/452747947273746017e24c33ce624009336abb5c">https://github.com/macports/macports-ports/commit/452747947273746017e24c33ce624009336abb5c</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 45274794727 qt5*: fix +universal configure
</span>45274794727 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 452747947273746017e24c33ce624009336abb5c
</span>Author: Luke Street <luke.street@encounterpc.com>
AuthorDate: Sun Apr 11 10:39:25 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt5*: fix +universal configure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Restores QMAKE_APPLE_DEVICE_ARCHS
</span>---
aqua/qt5/Portfile | 24 ++++++++++++------------
aqua/qt5/files/patch-mkspecs.diff | 3 ++-
aqua/qt511/Portfile | 4 ++--
aqua/qt513/Portfile | 4 ++--
aqua/qt59/Portfile | 4 ++--
5 files changed, 20 insertions(+), 19 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 c5f43b042e8..2df916bfab3 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;'>@@ -1035,8 +1035,8 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-qmake_flags.diff
post-patch {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_cxx [portconfigure::configure_get_universal_cflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_ld [portconfigure::configure_get_universal_ldflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_cxx [portconfigure::configure_get_universal_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_ld [portconfigure::configure_get_universal_archflags]
</span> } else {
set arch_replace_cxx [portconfigure::configure_get_archflags cxx]
set arch_replace_ld [portconfigure::configure_get_ld_archflags]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1130,16 +1130,16 @@ foreach {module module_info} [array get modules] {
</span> }
# respect configure.universal_archs or build_arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set arch_replace ${configure.universal_archs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set arch_replace ${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "s|__MACPORTS_DEVICE_ARCHS__|${arch_replace}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/mkspecs/common/macx.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace ${configure.universal_archs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_DEVICE_ARCHS__|${arch_replace}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mkspecs/common/macx.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# use MacPorts X11
post-patch {
<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 d9a08079835..b61636e4b4a 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;'>@@ -45,7 +45,7 @@ diff --git mkspecs/common/macx.conf mkspecs/common/macx.conf
</span> index 4ba0a8ea..5f75283f 100644
--- mkspecs/common/macx.conf
+++ mkspecs/common/macx.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,9 +3,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,9 +3,10 @@
</span> #
QMAKE_PLATFORM += macos osx macx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,7 @@ index 4ba0a8ea..5f75283f 100644
</span>
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
<span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span>
# Should be 10.15, but as long as the CI builds with
# older SDKs we have to keep this.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbe5bc12699..9290a9bba9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -912,8 +912,8 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-qmake_flags.diff
post-patch {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_cxx [portconfigure::configure_get_universal_cflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_ld [portconfigure::configure_get_universal_ldflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_cxx [portconfigure::configure_get_universal_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_ld [portconfigure::configure_get_universal_archflags]
</span> } else {
set arch_replace_cxx [portconfigure::configure_get_archflags cxx]
set arch_replace_ld [portconfigure::configure_get_ld_archflags]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb1f1d9e924..47ebbcf3304 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -914,8 +914,8 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-qmake_flags.diff
post-patch {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_cxx [portconfigure::configure_get_universal_cflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_ld [portconfigure::configure_get_universal_ldflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_cxx [portconfigure::configure_get_universal_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_ld [portconfigure::configure_get_universal_archflags]
</span> } else {
set arch_replace_cxx [portconfigure::configure_get_archflags cxx]
set arch_replace_ld [portconfigure::configure_get_ld_archflags]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94ec3bf9151..db816e69b55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -914,8 +914,8 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-qmake_flags.diff
post-patch {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_cxx [portconfigure::configure_get_universal_cflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_replace_ld [portconfigure::configure_get_universal_ldflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_cxx [portconfigure::configure_get_universal_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_replace_ld [portconfigure::configure_get_universal_archflags]
</span> } else {
set arch_replace_cxx [portconfigure::configure_get_archflags cxx]
set arch_replace_ld [portconfigure::configure_get_ld_archflags]
</pre><pre style='margin:0'>
</pre>