mingw-w64-clang: update to 18.1.1

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

mingw-w64-clang/PKGBUILD

@@ -28,11 +28,11 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-lld"
          "${MINGW_PACKAGE_PREFIX}-llvm"
          "${MINGW_PACKAGE_PREFIX}-llvm-libs")
-_version=17.0.6
-_rc=
+_version=18.1.1
+_rc=""
 _tag=llvmorg-${_version}${_rc}
 pkgver=${_version}${_rc/-/}
-pkgrel=3
+pkgrel=2
 pkgdesc="C language family frontend for LLVM (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -63,40 +63,42 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
         "${_url}/lld-${pkgver}.src.tar.xz"{,.sig}
         "${_url}/cmake-${pkgver}.src.tar.xz"{,.sig}
         "${_url}/third-party-${pkgver}.src.tar.xz"{,.sig}
+        # 0001-0099 -> llvm
         "0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch"
         "0002-Fix-Findzstd-on-MINGW.patch"
         "0003-add-pthread-as-system-lib-for-mingw.patch"
         "0004-enable-emutls-for-mingw.patch"
+        "0005-use-SOVERSION-on-mingw.patch"
+        # 0101-0199 -> clang
         "0101-link-pthread-with-mingw.patch"
         "0102-Rename-flang-new-flang-experimental-exec-to-flang.patch"
-        "0303-ignore-new-bfd-options.patch")
-# Some patch notes :)
-#0001-0099 -> llvm
-#0101-0199 -> clang
-#0201-0299 -> rt
-#0301-0399 -> lld
-#0401-0499 -> clang-tools-extra
-sha256sums=('b638167da139126ca11917b6880207cc6e8f9d1cbb1a48d87d017f697ef78188'
+        # 0201-0299 -> rt
+        # 0301-0399 -> lld
+        "0303-ignore-new-bfd-options.patch"
+        # 0401-0499 -> clang-tools-extra
+        )
+sha256sums=('ab0508d02b2d126ceb98035c28638a9d7b1e7fa5ef719396236e72f59a02e1ac'
             'SKIP'
-            'a78f668a726ae1d3d9a7179996d97b12b90fb76ab9442a43110b972ff7ad9029'
+            '412a482b81a969846b127552f8fa2251c7d57a82337f848fe7fea8e6ce614836'
             'SKIP'
-            'aa774642415d338d7b77a66fcbad6fd1f77f382dabcb67422a6230614eff1ab9'
+            '76d3a0ab82b4337324cb8286072bb684549bd980a58aec85b75487b36d18e532'
             'SKIP'
-            '11b8d09dcf92a0f91c5c82defb5ad9ff4acf5cf073a80c317204baa922d136b4'
+            '037b1fbbc6ea90c9ef299caab8a751b435ca6ede2d1972db15b30646636ee057'
             'SKIP'
-            '4ac13125616dc44905b85820aa403d27ec1226329b7f674daeb5f5584c6f0b22'
+            '8456e8be08767f1f257733c5b56d0671d5b1a43fd78ffa53f024f307641f4612'
             'SKIP'
-            '807f069c54dc20cb47b21c1f6acafdd9c649f3ae015609040d6182cab01140f4'
+            '5308023d1c1e9feb264c14f58db35c53061123300a7eb940364f46d574c8b2d6'
             'SKIP'
-            '3054d0a9c9375dab1a4539cc2cc45ab340341c5d71475f9599ba7752e222947b'
+            '41cdf4fe95faa54f497677313b906e04e74079a03defa9fdc2f07ed5f259f1ef'
             'SKIP'
             'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff'
-            'd7d58ad5d0e77f2803070a8fb7f4138a6f49a2cbf30c55ff059c31f40ca6b65c'
-            '7f0c64cd87b61e894be632f180ae5291e1aa9f1d9d382608f659067eeeda7146'
+            '70930739511f0934bafad518cd02acbccd03915ca4c6bec4b272eb5bcec33e1e'
+            '016fbf6f742c062cc59360070264546c10385b1e8c37605758f62dcbea8f9bcc'
             '5f86e542dd1ec92b2fe06ee59061c3e23512df7bafabe82206f2b7d80b81836b'
+            '6afc754f03f3dbe358b67d474bcec9d7779bca0c91aa82c2829fc54ccf7f6f1b'
             '715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26'
             '2770cadf8ccf6b31aece6aee8f76dceb71e6e9d01fdf3be74c3743480ce34899'
-            'de631ab199a6fe83b3f695350bffaad067a2f95fc2ba9c8fe57dc85665d3653c')
+            'fd0253879cc5e31857f57307e6105e56493358e35d7c4540e0b476be607ab94e')
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'  # Hans Wennborg, Google.
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard
               'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta
@@ -132,7 +134,8 @@ prepare() {
   cd "${srcdir}/llvm"
   apply_patch_with_msg \
     "0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch" \
-    "0002-Fix-Findzstd-on-MINGW.patch"
+    "0002-Fix-Findzstd-on-MINGW.patch" \
+    "0005-use-SOVERSION-on-mingw.patch"
 
   if (( ! _clangprefix )); then
     apply_patch_with_msg \
@@ -179,20 +182,23 @@ build() {
   FFI_INCLUDE_DIR=$(echo $FFI_INCLUDE_DIR | sed 's|-I||g')
 
   if check_option "debug" "y"; then
-    common_cmake_args+=(-DCMAKE_BUILD_TYPE=Debug)
+    common_cmake_args+=(-DCMAKE_BUILD_TYPE=Debug
+                        -DLLVM_ENABLE_ASSERTIONS=ON)
     VERBOSE="VERBOSE=1"
   else
-    common_cmake_args+=(-DCMAKE_BUILD_TYPE=MinSizeRel)
+    common_cmake_args+=(-DCMAKE_BUILD_TYPE=MinSizeRel
+                        -DLLVM_ENABLE_ASSERTIONS=OFF
+                        -DLLVM_ENABLE_DUMP=ON)
   fi
   common_cmake_args+=(-Wno-dev
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}
     -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib
+    -DCMAKE_DLL_NAME_WITH_SOVERSION=ON
     -DLLVM_HOST_TRIPLE="${CARCH}-w64-windows-gnu"
     -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe
     -DPython3_FIND_REGISTRY=NEVER
     -DPython3_ROOT_DIR=${MINGW_PREFIX}
     -DFFI_INCLUDE_DIR="${FFI_INCLUDE_DIR}"
-    -DLLVM_ENABLE_ASSERTIONS=OFF
     -DLLVM_ENABLE_FFI=ON
     -DLLVM_INCLUDE_EXAMPLES=OFF
     -DLLVM_INCLUDE_BENCHMARKS=OFF
@@ -215,8 +221,7 @@ build() {
       -DDEFAULT_SYSROOT=${MINGW_PREFIX} \
       -DLLVM_ENABLE_PROJECTS="clang;compiler-rt" \
       -DLLVM_BUILD_INSTRUMENTED=IR \
-      -DLLVM_TARGETS_TO_BUILD=Native \
-      -DLLVM_NATIVE_TOOL_DIR=${MINGW_PREFIX}/bin \
+      -DLLVM_TARGETS_TO_BUILD=Native
       -DCLANG_DEFAULT_RTLIB=compiler-rt \
       -DCLANG_DEFAULT_UNWINDLIB=libunwind \
       -DCLANG_DEFAULT_CXX_STDLIB=libc++ \
@@ -232,8 +237,7 @@ build() {
       -DCMAKE_C_COMPILER="${srcdir}"/build-${MSYSTEM}-instrument/bin/clang.exe \
       -DCMAKE_CXX_COMPILER="${srcdir}"/build-${MSYSTEM}-instrument/bin/clang++.exe \
       -DLLVM_ENABLE_PROJECTS="clang" \
-      -DLLVM_TARGETS_TO_BUILD=Native \
-      -DLLVM_NATIVE_TOOL_DIR=${MINGW_PREFIX}/bin \
+      -DLLVM_TARGETS_TO_BUILD=Native
       "${common_cmake_args[@]}" \
       ../llvm
     # Drop profiles generated from running cmake; those are not representative.
@@ -329,7 +333,7 @@ package_clang() {
   # Runtime libraries
   rm -rf "${srcdir}/clang-libs"
   mkdir -p "${srcdir}/clang-libs/${MINGW_PREFIX}/bin"
-  mv -f "${pkgdir}${MINGW_PREFIX}"/bin/libclang{,-cpp}.dll "${srcdir}/clang-libs/${MINGW_PREFIX}/bin"
+  mv -f "${pkgdir}${MINGW_PREFIX}"/bin/libclang-*.dll "${srcdir}/clang-libs/${MINGW_PREFIX}/bin"
 }
 
 package_clang-libs() {
@@ -352,7 +356,7 @@ package_clang-analyzer() {
 
   local _analyzer
   for _analyzer in scan-build scan-build-py scan-view; do
-    DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}/build-${MSYSTEM}" --component ${_analyzer}
+    DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}/build-${MSYSTEM}/tools/clang/tools/${_analyzer}"
   done
 
   # Compile Python scripts
@@ -426,7 +430,7 @@ package_llvm() {
   # Runtime libraries
   rm -rf "${srcdir}/llvm-libs"
   mkdir -p "${srcdir}/llvm-libs/${MINGW_PREFIX}/bin"
-  mv -f "${pkgdir}${MINGW_PREFIX}"/bin/lib{LLVM-*,LTO,Remarks}.dll "${srcdir}/llvm-libs/${MINGW_PREFIX}/bin"
+  mv -f "${pkgdir}${MINGW_PREFIX}"/bin/lib{LLVM,LTO,Remarks}-*.dll "${srcdir}/llvm-libs/${MINGW_PREFIX}/bin"
 
   # Provide gcov on CLANG*
   if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then