diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 42c0d66f..4e16271b 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,10 +3,10 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libclang/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240226095317+113052b2b022.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/clang/tools/libclang/CMakeLists.txt @@ -135,7 +135,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,13 +16,13 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/llvm/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240226095317+113052b2b022.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240226095317+113052b2b022/llvm/tools/llvm-shlib/CMakeLists.txt @@ -38,6 +38,8 @@ if(LLVM_BUILD_LLVM_DYLIB) - get_target_property(LLVM_DYLIB_FILENAME LLVM OUTPUT_NAME) - llvm_install_library_symlink(LLVM-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX} ${LLVM_DYLIB_FILENAME} SHARED COMPONENT LLVM) + 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}) + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + diff --git a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff deleted file mode 100644 index 71669df2..00000000 --- a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/third_party/Python/module/unittest2/unittest2/runner.py -=================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/third_party/Python/module/unittest2/unittest2/runner.py -@@ -174,9 +174,9 @@ class TextTestRunner(unittest.TextTestRu - if hasattr(result, 'separator2'): - self.stream.writeln(result.separator2) - run = result.testsRun -- self.stream.writeln("Ran %d test%s in %.3fs" % -- (run, run != 1 and "s" or "", timeTaken)) -- self.stream.writeln() -+# self.stream.writeln("Ran %d test%s in %.3fs" % -+# (run, run != 1 and "s" or "", timeTaken)) -+# self.stream.writeln() - - expectedFails = unexpectedSuccesses = skipped = passed = failed = errored = 0 - try: diff --git a/debian/patches/series b/debian/patches/series index 170f00de..d791d81e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,7 +21,6 @@ debug-jit-path.diff #force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff -disable-display-PASS-UNSUPPORTED-XFAIL.diff # Lib names 0044-soname.diff