Merge branch '17' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into 17

This commit is contained in:
Matthias Klose 2023-11-27 10:37:19 +01:00
commit eb0584923e

View File

@ -3,10 +3,10 @@
tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
Index: llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/clang/tools/libclang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libclang/CMakeLists.txt
--- llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/clang/tools/libclang/CMakeLists.txt
@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
remove_definitions("-D_XOPEN_SOURCE=700")
endif()
@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/libc
OUTPUT_NAME ${output_name}
${SOURCES}
Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/llvm/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-shlib/CMakeLists.txt
--- llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8.orig/llvm/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/llvm/tools/llvm-shlib/CMakeLists.txt
@@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/tools/llvm-
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
if((MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")