<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/0df8a423da6d19c11f2cbb0b152884a08ef8f98c">https://github.com/macports/macports-ports/commit/0df8a423da6d19c11f2cbb0b152884a08ef8f98c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0df8a423da6d19c11f2cbb0b152884a08ef8f98c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 11 04:35:59 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5: do not duplicate reinplace calls for universal
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    No revbump because functionality does not change.
</span>---
 aqua/qt5/Portfile | 54 ++++++++++++++++++++++--------------------------------
 1 file changed, 22 insertions(+), 32 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 3513268..a948dbb 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;'>@@ -791,24 +791,20 @@ foreach {module module_info} [array get modules] {
</span> 
             # ensure qmake builds for the correct architecture
             patchfiles-append patch-qmake_flags.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_CXX_ARCH_FLAGS__|[portconfigure::configure_get_archflags cxx]|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/qmake/Makefile.unix.macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_LD_ARCH_FLAGS__|[portconfigure::configure_get_ld_archflags]|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/qmake/Makefile.unix.macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_CXX_ARCH_FLAGS__|[portconfigure::configure_get_universal_cflags]|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/qmake/Makefile.unix.macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_LD_ARCH_FLAGS__|[portconfigure::configure_get_universal_ldflags]|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/qmake/Makefile.unix.macos
</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_cxx [portconfigure::configure_get_universal_cflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set arch_replace_ld  [portconfigure::configure_get_universal_ldflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set arch_replace_cxx [portconfigure::configure_get_archflags cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set arch_replace_ld  [portconfigure::configure_get_ld_archflags]
</span>                 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CXX_ARCH_FLAGS__|${arch_replace_cxx}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/qmake/Makefile.unix.macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_LD_ARCH_FLAGS__|${arch_replace_ld}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/qmake/Makefile.unix.macos
</span>             }
 
             # respect MacPorts build variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -889,22 +885,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;'>-            variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    foreach spec {macx-clang macx-g++ macx-icc} {
</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__|${configure.universal_archs}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            ${worksrcpath}/mkspecs/${spec}/qmake.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:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    foreach spec {macx-clang macx-g++ macx-icc} {
</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__|${build_arch}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            ${worksrcpath}/mkspecs/${spec}/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach spec {macx-clang macx-g++ macx-icc} {
</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/${spec}/qmake.conf
</span>                 }
             }
 
</pre><pre style='margin:0'>

</pre>