<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/626b3f21c08aaec6a2a681934a532eb34a829422">https://github.com/macports/macports-ports/commit/626b3f21c08aaec6a2a681934a532eb34a829422</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 626b3f21c08 qt5*-qtbase: fix compiler choice
</span>626b3f21c08 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 626b3f21c08aaec6a2a681934a532eb34a829422
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu Dec 19 17:11:55 2024 +0400

<span style='display:block; white-space:pre;color:#404040;'>    qt5*-qtbase: fix compiler choice
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/71592
</span>---
 aqua/qt5/Portfile   | 41 +++++++----------------------------------
 aqua/qt511/Portfile | 41 +++++++----------------------------------
 aqua/qt513/Portfile | 41 +++++++----------------------------------
 3 files changed, 21 insertions(+), 102 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 a102ad4443f..633420fd7b7 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;'>@@ -1130,41 +1130,14 @@ foreach {module module_info} [array get modules] {
</span>             patchfiles-append patch-mkspecs.diff
 
             # respect configure.compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CC__|${configure.cc}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CXX__|${configure.cxx}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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;'>+            post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CC__|${configure.cc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/clang.conf
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { [string match macports-clang-* ${configure.compiler}] && [vercmp ${xcodeversion} "7.0"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # non-Xcode clang does not seem to be able to understand tbd files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # for an explanation of tbd files, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                #    https://stackoverflow.com/questions/31450690/why-xcode-7-shows-tbd-instead-of-dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # see https://trac.macports.org/ticket/53151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "This configuration is known to fail"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "See https://trac.macports.org/ticket/53151"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "As a workaround, do not set configure.compiler manually"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    return -code error "incompatible configuration"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CXX__|${configure.cxx}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/clang.conf
</span>             }
 
             post-patch {
<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 36b498b61d5..5630998a1bd 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;'>@@ -904,41 +904,14 @@ foreach {module module_info} [array get modules] {
</span>             patchfiles-append patch-mkspecs.diff
 
             # respect configure.compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CC__|${configure.cc}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CXX__|${configure.cxx}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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;'>+            post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CC__|${configure.cc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/clang.conf
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { [string match macports-clang-* ${configure.compiler}] && [vercmp ${xcodeversion} "7.0"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # non-Xcode clang does not seem to be able to understand tbd files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # for an explanation of tbd files, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                #    https://stackoverflow.com/questions/31450690/why-xcode-7-shows-tbd-instead-of-dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # see https://trac.macports.org/ticket/53151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "This configuration is known to fail"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "See https://trac.macports.org/ticket/53151"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "As a workaround, do not set configure.compiler manually"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    return -code error "incompatible configuration"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CXX__|${configure.cxx}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/clang.conf
</span>             }
 
             post-patch {
<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 13ff33ca017..7c6949d2353 100644
</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;'>@@ -913,41 +913,14 @@ foreach {module module_info} [array get modules] {
</span>             patchfiles-append patch-mkspecs.diff
 
             # respect configure.compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${configure.compiler} eq "clang" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # let xargs find correct compiler (default behaviour)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    # let xargs find correct compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_CC__|clang|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CXX__|clang++|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CC__|${configure.cc}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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_CXX__|${configure.cxx}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/common/clang.conf
</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;'>+            post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CC__|${configure.cc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/clang.conf
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { [string match macports-clang-* ${configure.compiler}] && [vercmp ${xcodeversion} "7.0"] >= 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # non-Xcode clang does not seem to be able to understand tbd files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # for an explanation of tbd files, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                #    https://stackoverflow.com/questions/31450690/why-xcode-7-shows-tbd-instead-of-dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # see https://trac.macports.org/ticket/53151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "This configuration is known to fail"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "See https://trac.macports.org/ticket/53151"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_error "As a workaround, do not set configure.compiler manually"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    return -code error "incompatible configuration"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_CXX__|${configure.cxx}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/clang.conf
</span>             }
 
             post-patch {
</pre><pre style='margin:0'>

</pre>