* New snapshot release

* Fix llvm-config with the change of versionning (Closes: #888592)
This commit is contained in:
Sylvestre Ledru 2018-01-28 17:34:48 +00:00
parent b0aa41be34
commit c956da0544
2 changed files with 26 additions and 11 deletions

6
debian/changelog vendored
View File

@ -1,9 +1,11 @@
llvm-toolchain-snapshot (1:7~svn322880-2) unstable; urgency=medium
llvm-toolchain-snapshot (1:7~svn323616-1~exp1) experimental; urgency=medium
* New snapshot release
* Fix llvm-config with the change of versionning (Closes: #888592)
* Update the creation of the README to unbreak the mips* FTBFS
* Update of the clang-tools-X.Y description
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 23 Jan 2018 08:58:40 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 28 Jan 2018 13:43:37 +0100
llvm-toolchain-snapshot (1:7~svn322880-1) unstable; urgency=medium

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_7~svn322673/cmake/modules/AddLLVM.cmake
Index: llvm-toolchain-snapshot_7~svn323616/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm-toolchain-snapshot_7~svn322673.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_7~svn322673/cmake/modules/AddLLVM.cmake
--- llvm-toolchain-snapshot_7~svn323616.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_7~svn323616/cmake/modules/AddLLVM.cmake
@@ -83,7 +83,7 @@ function(add_llvm_symbol_exports target_
# FIXME: Don't write the "local:" line on OpenBSD.
# in the export file, also add a linker script to version LLVM symbols (form: LLVM_N.M)
@ -29,10 +29,10 @@ Index: llvm-toolchain-snapshot_7~svn322673/cmake/modules/AddLLVM.cmake
set(api_name ${output_name}-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
set_target_properties(${name} PROPERTIES OUTPUT_NAME ${library_name})
llvm_install_library_symlink(${api_name} ${library_name} SHARED
Index: llvm-toolchain-snapshot_7~svn322673/clang/CMakeLists.txt
Index: llvm-toolchain-snapshot_7~svn323616/clang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_7~svn322673.orig/clang/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn322673/clang/CMakeLists.txt
--- llvm-toolchain-snapshot_7~svn323616.orig/clang/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn323616/clang/CMakeLists.txt
@@ -418,10 +418,10 @@ endif()
# Clang version information
@ -46,10 +46,23 @@ Index: llvm-toolchain-snapshot_7~svn322673/clang/CMakeLists.txt
"Version number that will be placed into the libclang library , in the form XX.YY")
mark_as_advanced(CLANG_EXECUTABLE_VERSION LIBCLANG_LIBRARY_VERSION)
Index: llvm-toolchain-snapshot_7~svn322673/tools/llvm-shlib/simple_version_script.map.in
Index: llvm-toolchain-snapshot_7~svn323616/tools/llvm-shlib/simple_version_script.map.in
===================================================================
--- llvm-toolchain-snapshot_7~svn322673.orig/tools/llvm-shlib/simple_version_script.map.in
+++ llvm-toolchain-snapshot_7~svn322673/tools/llvm-shlib/simple_version_script.map.in
--- llvm-toolchain-snapshot_7~svn323616.orig/tools/llvm-shlib/simple_version_script.map.in
+++ llvm-toolchain-snapshot_7~svn323616/tools/llvm-shlib/simple_version_script.map.in
@@ -1 +1 @@
-LLVM_@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@ { global: *; };
+LLVM_@LLVM_VERSION_MAJOR@ { global: *; };
Index: llvm-toolchain-snapshot_7~svn323616/tools/llvm-config/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_7~svn323616.orig/tools/llvm-config/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn323616/tools/llvm-config/CMakeLists.txt
@@ -36,7 +36,7 @@ set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAK
set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
set(LLVM_BUILD_SYSTEM cmake)
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
-set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
+set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}")
set(LLVM_HAS_GLOBAL_ISEL "ON")
# Use the C++ link flags, since they should be a superset of C link flags.