<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f89ccd5d9ee013d8cc0f81c44094cec0c1275102">https://github.com/macports/macports-ports/commit/f89ccd5d9ee013d8cc0f81c44094cec0c1275102</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f89ccd5d9ee013d8cc0f81c44094cec0c1275102
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Nov 3 10:49:39 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> qt5: Centralise LLVM/Clang version setting
</span>---
aqua/qt5/Portfile | 7 +++++--
1 file changed, 5 insertions(+), 2 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 7e5a572fc99..a9c998173ab 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;'>@@ -59,6 +59,9 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts LLVM/Clang version to use when required.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,7 +569,7 @@ array set modules {
</span> 8894728
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:clang-11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:clang-${llvm_version}"
</span> "qtbase qtdeclarative"
{"Qt Designer" "Qt Help" "Qt UI Tools"}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1622,7 +1625,7 @@ foreach {module module_info} [array get modules] {
</span>
# qdoc now uses libclang for parsing C/C++ code
# see https://wiki.qt.io/New_Features_in_Qt_5.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append LLVM_INSTALL_DIR=${prefix}/libexec/llvm-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append LLVM_INSTALL_DIR=${prefix}/libexec/llvm-${llvm_version}
</span> }
# special case
</pre><pre style='margin:0'>
</pre>