<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/35477a34865e46dac866feb67f5604c6ff8636ba">https://github.com/macports/macports-ports/commit/35477a34865e46dac866feb67f5604c6ff8636ba</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 35477a34865 qt6: various build fixes
</span>35477a34865 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35477a34865e46dac866feb67f5604c6ff8636ba
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Wed Jul 20 11:49:56 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt6: various build fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Allow compiler selection
</span><span style='display:block; white-space:pre;color:#404040;'> - Allow using ccache
</span><span style='display:block; white-space:pre;color:#404040;'> - Run ninja verbosely
</span><span style='display:block; white-space:pre;color:#404040;'> - Set ninja build dependency for modules
</span><span style='display:block; white-space:pre;color:#404040;'> - qtdeclarative: Migrate to Python 3.10
</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/65500
</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 | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 42 insertions(+), 8 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 7c2e691e24a..585e663ea67 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;'>@@ -176,7 +176,7 @@ array set modules {
</span> 5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71
29764804
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:ninja port:python39"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python310"
</span> ""
"qtbase qtsvg qtimageformats"
{"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +191,7 @@ array set modules {
</span> df61dc1a517988bfa123117c78a7dbeda859cbb6d9cbd080ce60058277bca3df
1845284
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:ninja"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp"
"qtbase"
{"Qt Image Formats"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,7 +296,7 @@ array set modules {
</span> 86e27e005c2421052ca90e619c8d13f1bd19c6bf1a7b84dd4e0f7855fc884fd7
1717684
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:ninja"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> ""
"qtbase"
{"Qt SVG"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,7 +311,7 @@ array set modules {
</span> 5a856d3d3d5fe6e15dc3f1af707a0ef1df2e687850403fc94af635edb9312bfb
8668512
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:ninja"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "port:clang-${llvm_version}"
"qtbase qtdeclarative"
{"Qt Designer" "Qt Help" "Qt UI Tools"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,7 +326,7 @@ array set modules {
</span> 3f680b520da585697fc725697a52c7d2074a6a728f6830366b491a6f8b9183c7
1444712
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:ninja"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> ""
"qttools"
{"translation files"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -555,6 +555,7 @@ foreach {module module_info} [array get modules] {
</span>
# use ninja for the build/installation
build.cmd "ninja"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.post_args-append -v
</span> destroot.target install
# ninja needs the DESTDIR argument in the environment
destroot.destdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -752,6 +753,25 @@ foreach {module module_info} [array get modules] {
</span> # use -Os instead of -O2
configure.args-append -optimize-size
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set CMake variables (similar to what cmake portgroup does)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to allow using ccache and controlling compiler selection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -- \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_C_COMPILER=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_COMPILER=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OBJC_COMPILER=${configure.objc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OBJCXX_COMPILER=${configure.objcxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not use `configure.args-append -ccache`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # or `configure.post_args-append -DQT_USE_CCACHE=1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # since that affects installed files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_C_COMPILER_LAUNCHER=${prefix}/bin/ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_COMPILER_LAUNCHER=${prefix}/bin/ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OBJC_COMPILER_LAUNCHER=${prefix}/bin/ccache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OBJCXX_COMPILER_LAUNCHER=${prefix}/bin/ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-no-testcocoon \
-force-pkg-config
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -886,7 +906,9 @@ foreach {module module_info} [array get modules] {
</span> configure.dir ${workpath}/build
# Qt suggests using Ninja to build
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:ninja
</span> build.cmd ninja
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.post_args-append -v
</span> build.dir ${workpath}/build
destroot.target install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -894,6 +916,18 @@ foreach {module module_info} [array get modules] {
</span> destroot.destdir
destroot.env-append DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set CMake variables (similar to what cmake portgroup does)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to allow using ccache and controlling compiler selection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -- \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_C_COMPILER=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_COMPILER=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OBJC_COMPILER=${configure.objc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OBJCXX_COMPILER=${configure.objcxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -DQT_USE_CCACHE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # determine which variants are to be turned off
set request_examples true
set request_tests true
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1154,9 +1188,9 @@ if { [info exists depends_lib] } {
</span> }
foreach deps ${depends_check} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string first ":python39" ${deps}] >= 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If Qt components use Python, ensure that MacPorts python39 is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string first ":python310" ${deps}] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If Qt components use Python, ensure that MacPorts python310 is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.10
</span> }
}
if { ${python_framework} ne "" } {
</pre><pre style='margin:0'>
</pre>