proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-05 23:33:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

library-binary-filename.diff removed (applied upstream)

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-04-06 17:06:40 +02:00
commit 77c2bdca91
3 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Sat, 17 Mar 2018 16:53:15 +0100

68
debian/patches/library-binary-filename.diff vendored
View File

@ -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.

1
debian/patches/series vendored
View File

@ -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