Accepting request 1130464 from devel:tools:compiler

- Update to version 17.0.6.
  * This release contains bug-fixes for the LLVM 17.0.0 release.
    This release is API and ABI compatible with 17.0.0.
- Rebase patches:
  * llvm-do-not-install-static-libraries.patch
  * llvm-normally-versioned-libllvm.patch
- Use major version only instead of full (patch-level) version for
  versioned executables: we don't support parallel installation of
  multiple versions of the same LLVM major version. (boo#1217450)
  Also drop the clang-X.Y symlink that was introduced for
  boo#1012260, because Y is always 0.
- Manage clang-cpp with update-alternatives like other binaries.

OBS-URL: https://build.opensuse.org/request/show/1130464
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/llvm17?expand=0&rev=6

clang-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66b45502b9d570fda7feefe3595e34f0bf0c49df84f4298c7735289427f17bcb
-size 21574748

clang-docs-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1524a659cbe618e46f4ca12c389b3fe96558e8cdbdaca6cab35e3cbf6baae189
-size 1614892

clang-tools-extra-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:599cf5ae037e8da4107efadccb996fd7f8e42a3ae96f8b09514560b840b8ab89
-size 3270140

cmake-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:734ea7767ebda642d22c878024c9fb14ae0521d048bdba54e463bb73260adaef
-size 8712

compiler-rt-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e3b4a05780baf04a11e80efbe5039ff3ef17af617233f326f073e7af2cdab89
-size 2420936

libcxx-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18c5d9413a63aa624c48273de4cce6b5e288b56a7a0b3cf4ecd93954255f4ddf
-size 3955896

libcxxabi-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b92dd9fdf7f8857f34498e33a73119c2fe23280414a107523c9704c891b9543
-size 575600

lld-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eaf86bc352be5d1a86b65aedbaf34cd38d149d17edf602ad9605c2eaea560eb3
-size 1506168

lldb-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfc10ed4a7de8681ca599c4718eecc91802f95c7f7dace66f5d0815b1aec6103
-size 10494184

llvm-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:569526fd017478eee51518a79c064442c0499269c6a6de586e409d91282afd04
-size 59298032

llvm-do-not-install-static-libraries.patch

@@ -2,10 +2,10 @@ This has similar effect as simply deleting the static libraries which we don't
 want after installation. By not copying them in the first place we reduce the
 disk usage during installation.
 
-Index: clang-17.0.5.src/cmake/modules/AddClang.cmake
+Index: clang-17.0.6.src/cmake/modules/AddClang.cmake
 ===================================================================
---- a/clang-17.0.5.src/cmake/modules/AddClang.cmake
-+++ b/clang-17.0.5.src/cmake/modules/AddClang.cmake
+--- a/clang-17.0.6.src/cmake/modules/AddClang.cmake
++++ b/clang-17.0.6.src/cmake/modules/AddClang.cmake
 @@ -106,12 +106,15 @@ macro(add_clang_library name)
  
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)
@@ -68,10 +68,10 @@ Index: cmake/modules/AddLLVM.cmake
    endif()
    if (ARG_MODULE)
      set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
-Index: lld-17.0.5.src/cmake/modules/AddLLD.cmake
+Index: lld-17.0.6.src/cmake/modules/AddLLD.cmake
 ===================================================================
---- a/lld-17.0.5.src/cmake/modules/AddLLD.cmake
-+++ b/lld-17.0.5.src/cmake/modules/AddLLD.cmake
+--- a/lld-17.0.6.src/cmake/modules/AddLLD.cmake
++++ b/lld-17.0.6.src/cmake/modules/AddLLD.cmake
 @@ -17,13 +17,6 @@ macro(add_lld_library name)
  
    if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
@@ -86,10 +86,10 @@ Index: lld-17.0.5.src/cmake/modules/AddLLD.cmake
      if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
        add_llvm_install_targets(install-${name}
          DEPENDS ${name}
-Index: polly-17.0.5.src/cmake/polly_macros.cmake
+Index: polly-17.0.6.src/cmake/polly_macros.cmake
 ===================================================================
---- a/polly-17.0.5.src/cmake/polly_macros.cmake
-+++ b/polly-17.0.5.src/cmake/polly_macros.cmake
+--- a/polly-17.0.6.src/cmake/polly_macros.cmake
++++ b/polly-17.0.6.src/cmake/polly_macros.cmake
 @@ -42,12 +42,14 @@ macro(add_polly_library name)
      llvm_config(${name} ${LLVM_LINK_COMPONENTS})
    endif( LLVM_LINK_COMPONENTS )
@@ -110,10 +110,10 @@ Index: polly-17.0.5.src/cmake/polly_macros.cmake
  endmacro(add_polly_library)
  
  macro(add_polly_loadable_module name)
-Index: polly-17.0.5.src/lib/CMakeLists.txt
+Index: polly-17.0.6.src/lib/CMakeLists.txt
 ===================================================================
---- a/polly-17.0.5.src/lib/CMakeLists.txt
-+++ b/polly-17.0.5.src/lib/CMakeLists.txt
+--- a/polly-17.0.6.src/lib/CMakeLists.txt
++++ b/polly-17.0.6.src/lib/CMakeLists.txt
 @@ -109,7 +109,7 @@ set_target_properties(PollyCore PROPERTI
  # It depends on all library it needs, such that with
  # LLVM_POLLY_LINK_INTO_TOOLS=ON, its dependencies like PollyISL are linked as

llvm-docs-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae53a57571944395ddcddd318f0512e88ec4923a1d185724e7d229c6ceb77a7a
-size 7138248

llvm-normally-versioned-libllvm.patch

@@ -46,11 +46,11 @@ Index: llvm-8.0.0rc3.src/tools/llvm-config/llvm-config.cpp
  
    // If LLVM_LINK_DYLIB is ON, the single shared library will be returned
    // for "--libs", etc, if they exist. This behaviour can be overridden with
-Index: llvm-8.0.0rc3.src/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-17.0.6.src/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-8.0.0rc3.src.orig/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-8.0.0rc3.src/tools/llvm-shlib/CMakeLists.txt
-@@ -42,7 +42,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
+--- llvm-17.0.6.src.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-17.0.6.src/tools/llvm-shlib/CMakeLists.txt
+@@ -30,7 +30,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
    if (LLVM_LINK_LLVM_DYLIB)
      set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN)
    endif()
@@ -58,7 +58,7 @@ Index: llvm-8.0.0rc3.src/tools/llvm-shlib/CMakeLists.txt
 +  add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
  
    list(REMOVE_DUPLICATES LIB_NAMES)
-   if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
+   if((MINGW) OR (HAIKU)
 Index: llvm-17.0.0rc1.src/test/lit.cfg.py
 ===================================================================
 --- llvm-17.0.0rc1.src.orig/test/lit.cfg.py

llvm17.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Nov 30 22:53:03 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Update to version 17.0.6.
+  * This release contains bug-fixes for the LLVM 17.0.0 release.
+    This release is API and ABI compatible with 17.0.0.
+- Rebase patches:
+  * llvm-do-not-install-static-libraries.patch
+  * llvm-normally-versioned-libllvm.patch
+- Use major version only instead of full (patch-level) version for
+  versioned executables: we don't support parallel installation of
+  multiple versions of the same LLVM major version. (boo#1217450)
+  Also drop the clang-X.Y symlink that was introduced for
+  boo#1012260, because Y is always 0.
+- Manage clang-cpp with update-alternatives like other binaries.
+
 -------------------------------------------------------------------
 Sat Nov 18 22:07:04 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 

llvm17.spec

@@ -16,7 +16,7 @@
 #
 
 
-%global _relver 17.0.5
+%global _relver 17.0.6
 %global _version %_relver%{?_rc:rc%_rc}
 %global _tagver %_relver%{?_rc:-rc%_rc}
 %global _sonum  17
@@ -24,7 +24,7 @@
 %global _soname %{_sonum}%{?_sosuffix}
 %global _itsme17 1
 # Integer version used by update-alternatives
-%global _uaver  1705
+%global _uaver  1706
 %global _soclang 13
 %global _socxx  1
 
@@ -219,6 +219,7 @@
     clang++ \
     clang-check \
     clang-cl \
+    clang-cpp \
     clang-extdef-mapping \
     clang-format \
     clang-linker-wrapper \
@@ -1265,35 +1266,28 @@ rm %{buildroot}%{_libdir}/libarcher_static.a
 # Prepare for update-alternatives usage
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 
-# Fix the clang -> clang-X.Y symlink to work with update-alternatives
+# Fix the clang -> clang-X symlink to work with update-alternatives
 mv %{buildroot}%{_bindir}/clang-%{_sonum} %{buildroot}%{_bindir}/clang
-ln -s %{_bindir}/clang-%{_relver} %{buildroot}%{_bindir}/clang-%{_sonum}
-ln -s %{_bindir}/clang-%{_relver} %{buildroot}%{_bindir}/clang-%{_minor}
-
-# Add clang++-X.Y symbolic link as well - it seems to be expected by some
-# software. https://bugzilla.opensuse.org/show_bug.cgi?id=1012260
-ln -s %{_bindir}/clang++-%{_relver} %{buildroot}%{_bindir}/clang++-%{_sonum}
-ln -s %{_bindir}/clang++-%{_relver} %{buildroot}%{_bindir}/clang++-%{_minor}
 
 # Rewrite symlinks to point to new location
 for p in %{shrink:%binfiles} ; do
     if [ -h "%{buildroot}%{_bindir}/$p" ] ; then
-        ln -f -s %{_bindir}/$(readlink %{buildroot}%{_bindir}/$p)-%{_relver} %{buildroot}%{_bindir}/$p
+        ln -f -s %{_bindir}/$(readlink %{buildroot}%{_bindir}/$p)-%{_sonum} %{buildroot}%{_bindir}/$p
     fi
 done
 for p in %{shrink:%binfiles} ; do
-    mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{_relver}
+    mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{_sonum}
     ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p
 done
 for p in %{shrink:%manfiles} ; do
-    mv %{buildroot}%{_mandir}/man1/$p.1 %{buildroot}%{_mandir}/man1/$p-%{_relver}.1
+    mv %{buildroot}%{_mandir}/man1/$p.1 %{buildroot}%{_mandir}/man1/$p-%{_sonum}.1
     ln -s -f %{_sysconfdir}/alternatives/$p.1%{ext_man} %{buildroot}%{_mandir}/man1/$p.1%{ext_man}
 done
 
 # Also rewrite the CMake files referring to the binaries.
 sed -i "$(
     for p in %{shrink:%binfiles}; do
-        echo "s|\"\${_IMPORT_PREFIX}/bin/$p\"|\"\${_IMPORT_PREFIX}/bin/$p-%{_relver}\"|g"
+        echo "s|\"\${_IMPORT_PREFIX}/bin/$p\"|\"\${_IMPORT_PREFIX}/bin/$p-%{_sonum}\"|g"
     done
 )" %{buildroot}%{_libdir}/cmake/{llvm/LLVMExports,clang/ClangTargets}-relwithdebinfo.cmake
 
@@ -1481,14 +1475,14 @@ rm -rf ./stage1 ./build
 %endif
 
 %global ua_install() %{_sbindir}/update-alternatives \\\
-    --install %{_bindir}/%1 %1 %{_bindir}/%1-%{_relver} %{_uaver}
+    --install %{_bindir}/%1 %1 %{_bindir}/%1-%{_sonum} %{_uaver}
 %global ua_bin_slave() \\\
-    --slave %{_bindir}/%1 %1 %{_bindir}/%1-%{_relver}
+    --slave %{_bindir}/%1 %1 %{_bindir}/%1-%{_sonum}
 %global ua_man_slave() \\\
-    --slave %{_mandir}/man1/%1.1%{ext_man} %1.1%{ext_man} %{_mandir}/man1/%1-%{_relver}.1%{ext_man}
+    --slave %{_mandir}/man1/%1.1%{ext_man} %1.1%{ext_man} %{_mandir}/man1/%1-%{_sonum}.1%{ext_man}
 %global ua_remove() \
-if [ ! -f %{_bindir}/%1-%{_relver} ] ; then \
-    %{_sbindir}/update-alternatives --remove %1 %{_bindir}/%1-%{_relver} \
+if [ ! -f %{_bindir}/%1-%{_sonum} ] ; then \
+    %{_sbindir}/update-alternatives --remove %1 %{_bindir}/%1-%{_sonum} \
 fi
 
 %post
@@ -1537,14 +1531,14 @@ fi
 
 %global bin_path() \
 %{_bindir}/%1
-%global bin_relver_path() \
-%{_bindir}/%1-%{_relver}
+%global bin_sonum_path() \
+%{_bindir}/%1-%{_sonum}
 %global ghost_ua_bin_link() \
 %ghost %{_sysconfdir}/alternatives/%1
 %global man_path() \
 %{_mandir}/man1/%1.1%{ext_man}
-%global man_relver_path() \
-%{_mandir}/man1/%1-%{_relver}.1%{ext_man}
+%global man_sonum_path() \
+%{_mandir}/man1/%1-%{_sonum}.1%{ext_man}
 %global ghost_ua_man_link() \
 %ghost %{_sysconfdir}/alternatives/%1.1%{ext_man}
 
@@ -1554,10 +1548,10 @@ fi
 %{lapply -p bin_path %llvm_elf_dwarf_tools}
 %{lapply -p bin_path %llvm_abi_coff_macho_tools}
 %{lapply -p bin_path %llvm_instr_devel_tools}
-%{lapply -p bin_relver_path %llvm_ua_anchor %llvm_tools}
-%{lapply -p bin_relver_path %llvm_elf_dwarf_tools}
-%{lapply -p bin_relver_path %llvm_abi_coff_macho_tools}
-%{lapply -p bin_relver_path %llvm_instr_devel_tools}
+%{lapply -p bin_sonum_path %llvm_ua_anchor %llvm_tools}
+%{lapply -p bin_sonum_path %llvm_elf_dwarf_tools}
+%{lapply -p bin_sonum_path %llvm_abi_coff_macho_tools}
+%{lapply -p bin_sonum_path %llvm_instr_devel_tools}
 %{lapply -p ghost_ua_bin_link %llvm_ua_anchor %llvm_tools}
 %{lapply -p ghost_ua_bin_link %llvm_elf_dwarf_tools}
 %{lapply -p ghost_ua_bin_link %llvm_abi_coff_macho_tools}
@@ -1566,29 +1560,24 @@ fi
 %{lapply -p man_path %llvm_man}
 %{lapply -p man_path %llvm_bin_utils_man}
 %{lapply -p man_path %llvm_devel_utils_man}
-%{lapply -p man_relver_path %llvm_man}
-%{lapply -p man_relver_path %llvm_bin_utils_man}
-%{lapply -p man_relver_path %llvm_devel_utils_man}
+%{lapply -p man_sonum_path %llvm_man}
+%{lapply -p man_sonum_path %llvm_bin_utils_man}
+%{lapply -p man_sonum_path %llvm_devel_utils_man}
 %{lapply -p ghost_ua_man_link %llvm_man}
 %{lapply -p ghost_ua_man_link %llvm_bin_utils_man}
 %{lapply -p ghost_ua_man_link %llvm_devel_utils_man}
 
 %files -n clang%{_sonum}
 %license CREDITS.TXT LICENSE.TXT
-%{_bindir}/clang-%{_minor}
-%{_bindir}/clang-%{_sonum}
-%{_bindir}/clang++-%{_minor}
-%{_bindir}/clang++-%{_sonum}
-%{_bindir}/clang-cpp
 %{lapply -p bin_path %clang_ua_anchor %clang_binfiles}
 %{lapply -p bin_path %clang_tools_extra_binfiles}
-%{lapply -p bin_relver_path %clang_ua_anchor %clang_binfiles}
-%{lapply -p bin_relver_path %clang_tools_extra_binfiles}
+%{lapply -p bin_sonum_path %clang_ua_anchor %clang_binfiles}
+%{lapply -p bin_sonum_path %clang_tools_extra_binfiles}
 %{lapply -p ghost_ua_bin_link %clang_ua_anchor %clang_binfiles}
 %{lapply -p ghost_ua_bin_link %clang_tools_extra_binfiles}
 
 %{lapply -p man_path %clang_manfiles}
-%{lapply -p man_relver_path %clang_manfiles}
+%{lapply -p man_sonum_path %clang_manfiles}
 %{lapply -p ghost_ua_man_link %clang_manfiles}
 
 %dir %{_libdir}/clang/
@@ -1756,7 +1745,7 @@ fi
 %files -n lld%{_sonum}
 %license CREDITS.TXT LICENSE.TXT
 %{lapply -p bin_path %lld_ua_anchor %lld_binfiles}
-%{lapply -p bin_relver_path %lld_ua_anchor %lld_binfiles}
+%{lapply -p bin_sonum_path %lld_ua_anchor %lld_binfiles}
 %{lapply -p ghost_ua_bin_link %lld_ua_anchor %lld_binfiles}
 %endif
 
@@ -1764,7 +1753,7 @@ fi
 %files -n lldb%{_sonum}
 %license CREDITS.TXT LICENSE.TXT
 %{lapply -p bin_path %lldb_ua_anchor %lldb_binfiles}
-%{lapply -p bin_relver_path %lldb_ua_anchor %lldb_binfiles}
+%{lapply -p bin_sonum_path %lldb_ua_anchor %lldb_binfiles}
 %{lapply -p ghost_ua_bin_link %lldb_ua_anchor %lldb_binfiles}
 
 %if %{with lldb_python}

openmp-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13c80e80d3eea2f4ffe89585a8e8c81bdedec410192c613fc089a12f7da4c0a2
-size 1273408

polly-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2048c2149fc61d134926bd662d039f06aba9ae193847fef0e8536075209c48ae
-size 9215772

runtimes-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:624ce23776dfb730e0b960091ba795c5ce26a0a7a0bea2e575804f1a5ac027e6
-size 6244

third-party-17.0.5.src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe2f67bda7b1c28ff3930a91481cf64b6059aacf7b683c29b95424d32a258890
-size 383700