mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-12-29 09:27:11 +00:00
228ad20aa7
X.Y.Z and X I am keeping the epoch because it would be too complex to manage with the various updates scenario * Two new symbols in libclang - clang_getFileContents - clang_isInvalidDeclaration * Fix the VCS-* tags
56 lines
3.2 KiB
Diff
56 lines
3.2 KiB
Diff
Index: llvm-toolchain-snapshot_7~svn322673/cmake/modules/AddLLVM.cmake
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_7~svn322673.orig/cmake/modules/AddLLVM.cmake
|
|
+++ llvm-toolchain-snapshot_7~svn322673/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~svn322673/clang/CMakeLists.txt
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_7~svn322673.orig/clang/CMakeLists.txt
|
|
+++ llvm-toolchain-snapshot_7~svn322673/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~svn322673/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
|
|
@@ -1 +1 @@
|
|
-LLVM_@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@ { global: *; };
|
|
+LLVM_@LLVM_VERSION_MAJOR@ { global: *; };
|