diff --git a/debian/changelog b/debian/changelog index f7a858be..d858cb69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-snapshot (1:7~svn327768-2) UNRELEASED; urgency=medium * llvm-dsymutil has been renamed to dsymutil * Remove sysconf_interceptor_bypass_test.cc because it makes Debian unstable and Ubuntu bionic freeze + * library-binary-filename.diff removed (applied upstream) -- Sylvestre Ledru Sat, 17 Mar 2018 16:53:15 +0100 diff --git a/debian/patches/library-binary-filename.diff b/debian/patches/library-binary-filename.diff deleted file mode 100644 index d18c08b1..00000000 --- a/debian/patches/library-binary-filename.diff +++ /dev/null @@ -1,68 +0,0 @@ -Index: llvm-toolchain-snapshot_7~svn323616/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) - add_custom_command(OUTPUT ${native_export_file} -- COMMAND echo "LLVM_${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} {" > ${native_export_file} -+ COMMAND echo "LLVM_${LLVM_VERSION_MAJOR} {" > ${native_export_file} - COMMAND grep -q "[[:alnum:]]" ${export_file} && echo " global:" >> ${native_export_file} || : - COMMAND sed -e "s/$/;/" -e "s/^/ /" < ${export_file} >> ${native_export_file} - COMMAND echo " local: *;" >> ${native_export_file} -@@ -486,7 +486,7 @@ function(llvm_add_library name) - PROPERTIES - # Since 4.0.0, the ABI version is indicated by the major version - SOVERSION ${LLVM_VERSION_MAJOR} -- VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) -+ VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}) - endif() - endif() - -@@ -508,7 +508,7 @@ function(llvm_add_library name) - if(${output_name} STREQUAL "output_name-NOTFOUND") - set(output_name ${name}) - endif() -- set(library_name ${output_name}-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}) -+ set(library_name ${output_name}-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}) - 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~svn323616/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 - set(CLANG_EXECUTABLE_VERSION -- "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING -+ "${CLANG_VERSION_MAJOR}" CACHE STRING - "Version number that will be placed into the clang executable, in the form XX.YY") - set(LIBCLANG_LIBRARY_VERSION -- "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING -+ "${CLANG_VERSION_MAJOR}" CACHE STRING - "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~svn323616/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. diff --git a/debian/patches/series b/debian/patches/series index 01259c90..302619a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,5 +46,4 @@ lldb-disable-swig-error.diff silent-test-macho.diff silent-llvm-isel-fuzzer.diff test-keep-alive.diff -library-binary-filename.diff remove-test-freezing.diff