Update QDoc libclang to 17.0.6

The version variable that is used to define the packages to download was updated to reflect the new version. A new case was added for the new "Debian11" on "arm64" package which was not a provisioned package on older version but is now provided. As "Debian11" was not currenly loading "libclang.sh", a new script that performs this process was added to "coin/provisioning/qtci-linux-Debian-11.6-aarch64". The newly sourced "libclang.sh" includes "coin/provisiong/common/unix/common.sourced.sh", which sets up certain common variables such as the used architecture and the platform id. When "common.sourced.sh" sets "PROVISION_ARCH", that contains the current platform architecture, it fails if the platform architecture is not supported. For "Debian11" on "arm64", the architecture, as reported by "uname -m" is "aarch64", which is equivalent to "arm64". "aarch64" was not handled by the script, so that a platform with that architecture would result in a fail when sourcing "common.sourced.sh". To avoid the failure, the case that sets "PROVISIONING_ARCH" to "arm64" will not trigger when the reported architecture is "aarch64". The specialized RedHat case was update to work specifically for version 9, to use the new specifically built package for Rhel9.2. The default case, previously using an "ubuntu20.04" package, was modified to use a "Rhel8.8" package. A package for "Ubuntu20.04" is not currently provided anymore as the platform was removed from CI and the new "22.04" package is not compatible with all the platforms that would use it. In particular, the new packages are built on a too new glibc, which will then fail to link, due to undefined symbols in the produced Clang libraries, when used on older-glibc platforms such as "OpenSuse15" and "Rhel8.8". The "Rhel8.8" package was specifically used as the platform for the default package as it ships the older glibc, "2.28", of the supported platforms, which should ensure that it works on the older-version platforms. The "sha1" variables for cached downloads was updated to reflect the new packages. For provisioning on windows, the version variable and the sha1 variables were updated to reflect the new version and the new packages, respectively. Task-number: QTBUG-111580 Task-number: QTBUG-121548 Change-Id: Ie7c1a8d8fe9114912d53a87f70ebfa00341a9d8a Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit 9975595a5e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1b97371ea0)
2023-11-18 12:07:11 +01:00 · 2023-11-18 12:07:11 +01:00 · 9d9634b9bb
parent 1cf50b24b1
commit 9d9634b9bb
5 changed files with 37 additions and 23 deletions
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@ -200,7 +200,7 @@ Configurations:
        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
    ]
 -
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@ -20,33 +20,33 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
 # shellcheck source=./common.sourced.sh
 source "$PROVISIONING_DIR"/common/unix/common.sourced.sh

-libclang_version="15.0.0"
+libclang_version="17.0.6"

 if uname -a |grep -q Darwin; then
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z"
    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z"
-    sha1="6d916a17459c81551dde47580ae3f071e93338a5"
-elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep -v "8" ; then
+    sha1="e8ecc2fb0d7d7a0f60a50379f16fbf3eef679d78"
+elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then
    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
-    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
-    sha1="6ca035bb522022d34d61759e0460845832933b5c"
-elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
-        version=$libclang_version
-        url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
-        url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
-        sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
-elif [ "$PROVISIONING_OS_ID" = debian ]; then
-        version=17.0.1
-        url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
-        url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
-        sha1="43f0210121b889107e3dab631e8104e661a3866b"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
+    sha1="102374379af906bd26085fcd18047cac4d0fb7bf"
+elif test "$PROVISIONING_OS_ID" == "ubuntu" ; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    sha1="4a793c9da9a02bd23c163c74dbc5565164a00c3f"
+elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+    sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93"
 else
    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    sha1="bd6615012b8bdb2720a45ede56e05f6db7191843"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
+    sha1="2a58cc71ad90eb6234c56ef7b141f32361b4312a"
 fi

 zip="/tmp/libclang.7z"
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@ -5,7 +5,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"

-$libclang_version="15.0.0"
+$libclang_version="17.0.6"
 Write-Output "libClang = $libclang_version" >> ~/versions.txt

 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@ -38,7 +38,7 @@ $toolchainSuffix = ""

 if ( $toolchain -eq "vs2019" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "e7c2d27f0e99d63e49225cb1be18c76a1e2a124b"
+        $sha1 = "7e3e474081d2e1d5d95c9743532de01b8e59b9aa"
    }
    else {
        $sha1 = ""
@ -48,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) {

 if ( $toolchain -eq "mingw" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "6c9300051533d5648ffe3e8ae1eb00decae8e6bf"
+        $sha1 = "b9e65f617cd8d6e8fb8ae734383f03f6a7b202ed"
    }
    else {
        $sha1 = ""
@ -56,6 +56,18 @@ if ( $toolchain -eq "mingw" ) {
    $toolchainSuffix = "mingw"
 }

+if ( $toolchain -eq "llvm-mingw" ) {
+    if ( $archVer -eq 64 ) {
+        $sha1 = "1844f107d067b69deabf375fc024848c1c8b015d"
+    }
+    else {
+        $sha1 = ""
+    }
+    # Due to COIN-1137 forced to use a '_' instead of '-'
+    $toolchainSuffix = "llvm_mingw"
+}
+
+
 install $sha1 $baseDestination-$archVer

 if ( $setDefault ) {
--- a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang.ps1
@ -1,3 +1,4 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
--- a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang.ps1
@ -1,3 +1,4 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019