Merge remote-tracking branch 'origin/18' into snapshot

debian/changelog

@@ -28,6 +28,7 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental
 
 llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium
 
+<<<<<<<
   [ John Paul Adrian Glaubitz ]
   * Install *clang_rt* on sparc and sparc64
   * Run chrpath for libclang on sparc and sparc64
@@ -38,11 +39,26 @@ llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium
     see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1
   * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now)
     (amd64, arm64 and armhf)
+=======
+  [ John Paul Adrian Glaubitz ]
+  * Install *clang_rt* on sparc and sparc64
+  * Run chrpath for libclang on sparc and sparc64
+
+  [ Sylvestre Ledru ]
+  * New snapshot release
+  * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules
+    see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1
+  * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now)
+    (amd64, arm64 and armhf)
+  * Also install usr/lib/llvm-19/lib/libLLVM.so.1
+    and usr/lib/llvm-19/lib/libLLVM.so.18.0
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 28 Feb 2024 11:08:41 +0100
 
 llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium
 
+<<<<<<<
   * Fix 32bit builds, exclude i386, don't build clang-rt there
   * Revert gold linker on mips64el
   * Disable stack protector on mips64el
@@ -73,6 +89,11 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium
   * Fix 32bit builds, exclude i386, don't build clang-rt there
   * Revert gold linker on mips64el
   * Disable stack protector on mips64el
+=======
+  * Fix 32bit builds, exclude i386, don't build clang-rt there
+  * Revert gold linker on mips64el
+  * Disable stack protector on mips64el
+>>>>>>>
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 22 Feb 2024 17:58:05 +0100
 

debian/libclang-cppX.Y.install.in

@@ -1 +1,2 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
+

debian/libllvmX.Y.install.in

@@ -1,3 +1,3 @@
 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/
-usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1
+usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION_MINOR@
-usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@

debian/libomp5-X.Y.install.in

@@ -1,4 +1,5 @@
 #!/usr/bin/dh-exec
 
 usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5
-[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.0
+[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
+

debian/llvm-X.Y-linker-tools.install.in

@@ -1,4 +1,4 @@
 #!/usr/bin/dh-exec
 
-usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
 [!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so

debian/patches/0044-soname.diff

@@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libc
    OUTPUT_NAME ${output_name}
    ${SOURCES}
  
-Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/llvm/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-18_18.1.0-rc4/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240226095317+113052b2b022.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-18_18.1.0-rc4.orig/llvm/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-18_18.1.0-rc4/llvm/tools/llvm-shlib/CMakeLists.txt
 @@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
    get_target_property(LLVM_DYLIB_SOVERSION LLVM SOVERSION)
    llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} LLVM SHARED COMPONENT LLVM SOVERSION ${LLVM_DYLIB_SOVERSION})

debian/rules

@@ -15,6 +15,7 @@ GCC_VERSION              := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE))
 LLVM_EPOCH := 1:
 LLVM_VERSION   := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
 LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p")
+LLVM_VERSION_MINOR := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:[0-9]+\.([0-9]+)\.[0-9]+.*,\1,p")
 LLVM_VERSION_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p")
 ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL))
 	LLVM_VERSION_FULL := $(LLVM_VERSION).0.0
@@ -607,6 +608,7 @@ stamps/preconfigure:
 	@echo "PROJECTS=$(PROJECTS_LIST)"
 	@echo "RUNTIMES=$(RUNTIMES_LIST)"
 	@echo "LLVM_VERSION=$(LLVM_VERSION)"
+	@echo "LLVM_VERSION_MINOR=$(LLVM_VERSION_MINOR)"
 	@echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)"
 	@echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)"
 	@echo "PATH=$(PATH)"
@@ -631,6 +633,7 @@ stamps/preconfigure:
 			-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
 			-e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \
 			-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
+			-e "s|@LLVM_VERSION_MINOR@|$(LLVM_VERSION_MINOR)|g" \
 			-e "s|@LLVM_VERSION_NEXT@|$(LLVM_VERSION_NEXT)|g" \
 			-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
 	done