From d28dee30441a15dd8ab8076242674e57229ec5d0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 9 Feb 2019 17:48:44 +0100 Subject: [PATCH] remove 7.1.0 specific patches --- .../patches/7.1.0/revert-change-soname-2.diff | 19 ------- .../patches/7.1.0/revert-change-soname.diff | 56 ------------------- debian/patches/series | 8 --- 3 files changed, 83 deletions(-) delete mode 100644 debian/patches/7.1.0/revert-change-soname-2.diff delete mode 100644 debian/patches/7.1.0/revert-change-soname.diff diff --git a/debian/patches/7.1.0/revert-change-soname-2.diff b/debian/patches/7.1.0/revert-change-soname-2.diff deleted file mode 100644 index 527e57d8..00000000 --- a/debian/patches/7.1.0/revert-change-soname-2.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: llvm-toolchain-7_7.1.0~svn353565/cmake/modules/AddLLVM.cmake -=================================================================== ---- llvm-toolchain-7_7.1.0~svn353565.orig/cmake/modules/AddLLVM.cmake -+++ llvm-toolchain-7_7.1.0~svn353565/cmake/modules/AddLLVM.cmake -@@ -498,11 +498,9 @@ function(llvm_add_library name) - if(UNIX AND NOT APPLE AND NOT ARG_SONAME) - set_target_properties(${name} - PROPERTIES -- # Concatenate the version numbers since ldconfig expects exactly -- # one component indicating the ABI version, while LLVM uses -- # major+minor for that. -- SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} -- VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) -+ # Since 4.0.0, the ABI version is indicated by the major version -+ SOVERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} -+ VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}) - endif() - endif() - diff --git a/debian/patches/7.1.0/revert-change-soname.diff b/debian/patches/7.1.0/revert-change-soname.diff deleted file mode 100644 index d9912798..00000000 --- a/debian/patches/7.1.0/revert-change-soname.diff +++ /dev/null @@ -1,56 +0,0 @@ -Index: llvm-toolchain-7_7.1.0~svn353565/docs/ReleaseNotes.rst -=================================================================== ---- llvm-toolchain-7_7.1.0~svn353565.orig/docs/ReleaseNotes.rst -+++ llvm-toolchain-7_7.1.0~svn353565/docs/ReleaseNotes.rst -@@ -30,6 +30,9 @@ Non-comprehensive list of changes in thi - is available on the Visual Studio Marketplace. The new integration - supports Visual Studio 2017. - -+* Libraries have been renamed from 7.0 to 7. This change also impacts -+ downstream libraries like lldb. -+ - * The LoopInstSimplify pass (``-loop-instsimplify``) has been removed. - - * Symbols starting with ``?`` are no longer mangled by LLVM when using the -Index: llvm-toolchain-7_7.1.0~svn353565/tools/llvm-config/CMakeLists.txt -=================================================================== ---- llvm-toolchain-7_7.1.0~svn353565.orig/tools/llvm-config/CMakeLists.txt -+++ llvm-toolchain-7_7.1.0~svn353565/tools/llvm-config/CMakeLists.txt -@@ -37,7 +37,7 @@ set(LLVM_CFLAGS "${LLVM_DEFINITIONS}") - set(LLVM_CXXFLAGS "${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. -Index: llvm-toolchain-7_7.1.0~svn353565/tools/llvm-shlib/simple_version_script.map.in -=================================================================== ---- llvm-toolchain-7_7.1.0~svn353565.orig/tools/llvm-shlib/simple_version_script.map.in -+++ llvm-toolchain-7_7.1.0~svn353565/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-7_7.1.0~svn353565/cmake/modules/AddLLVM.cmake -=================================================================== ---- llvm-toolchain-7_7.1.0~svn353565.orig/cmake/modules/AddLLVM.cmake -+++ llvm-toolchain-7_7.1.0~svn353565/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} -@@ -522,7 +522,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 diff --git a/debian/patches/series b/debian/patches/series index c2cf86bc..04057d30 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -115,14 +115,6 @@ powerpcspe/D49754-powerpcspe-clang.diff powerpcspe/D54409-powerpcspe-register-spilling.diff powerpcspe/D54584-powerpcspe-double-parameter.diff - -# Disable https://llvm.org/viewvc/llvm-project?view=revision&revision=352580 -# 7.0.1 was always abi compatible with 7.0 -# Therefor, the libraries are still compatible with the 7.1.0 version -7.1.0/revert-change-soname-2.diff -7.1.0/revert-change-soname.diff - - # kfreebsd kfreebsd/clang_lib_Basic_Targets.diff kfreebsd/CMakeLists.txt.diff