<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ea653c25318598924008e7acc444417fb6c931e2">https://github.com/macports/macports-ports/commit/ea653c25318598924008e7acc444417fb6c931e2</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 ea653c25318 qt6-qtdeclarative: relocate special case
</span>ea653c25318 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ea653c25318598924008e7acc444417fb6c931e2
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Jul 22 20:03:38 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt6-qtdeclarative: relocate special case
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> compiler.blacklist must be set before configure.cc, etc. are read from
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt6/Portfile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b16be97b34..cc036e2d4e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -909,6 +909,13 @@ foreach {module module_info} [array get modules] {
</span> destroot.destdir
destroot.env-append DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case (needs to go before compiler options are read from)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtdeclarative" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 10.3 compiler segfaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 1100}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set CMake variables (similar to what cmake portgroup does)
# to allow using ccache and controlling compiler selection
configure.post_args --
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1017,12 +1024,6 @@ foreach {module module_info} [array get modules] {
</span> # Special Cases
###############################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtdeclarative" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 10.3 compiler segfaults
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 1100}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>