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

Fix the soname of libclang and libLLVM. Might cause some breakage with

Browse Source 
existing app but no choice...
This commit is contained in:
Sylvestre Ledru 2016-07-02 18:46:14 +00:00
parent ff9d895b2a
commit 2009781b41
4 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -23,6 +23,8 @@ llvm-toolchain-snapshot (1:3.9~svn274438-1) unstable; urgency=medium
issue on i386 issue on i386
* Ignore the lintian override about embedded-library for json. * Ignore the lintian override about embedded-library for json.
Doesn't link otherwise Doesn't link otherwise
* Fix the soname of libclang and libLLVM. Might cause some breakage with
existing app but no choice...
[ Pablo Oliveira ] [ Pablo Oliveira ]
* Add python-six as a dependency of python-lldb (Closes: #825371) * Add python-six as a dependency of python-lldb (Closes: #825371)
@ -53,7 +55,7 @@ llvm-toolchain-snapshot (1:3.9~svn274438-1) unstable; urgency=medium
[ YunQiang Su ] [ YunQiang Su ]
* Enable FPXX by default on mips/mipsel (Closes: #826749) * Enable FPXX by default on mips/mipsel (Closes: #826749)
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 10 Jun 2016 10:22:26 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Sat, 02 Jul 2016 20:46:05 +0200
llvm-toolchain-snapshot (1:3.9~svn260851-1) unstable; urgency=medium llvm-toolchain-snapshot (1:3.9~svn260851-1) unstable; urgency=medium

27
debian/patches/0044-soname.diff vendored
View File

@ -1,17 +1,8 @@
--- a/tools/llvm-shlib/Makefile Index: llvm-toolchain-snapshot_3.9~svn274438/tools/llvm-shlib/CMakeLists.txt
+++ b/tools/llvm-shlib/Makefile ===================================================================
@@ -67,7 +67,7 @@ --- llvm-toolchain-snapshot_3.9~svn274438.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_3.9~svn274438/tools/llvm-shlib/CMakeLists.txt
ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) @@ -37,6 +37,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
# Add soname to the library.
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions
endif
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
--- a/tools/llvm-shlib/CMakeLists.txt
+++ b/tools/llvm-shlib/CMakeLists.txt
@@ -39,6 +39,7 @@
endif() endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
@ -19,9 +10,11 @@
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf" if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
--- a/clang/tools/libclang/CMakeLists.txt Index: llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt ===================================================================
@@ -82,7 +82,7 @@ --- llvm-toolchain-snapshot_3.9~svn274438.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
@@ -83,7 +83,7 @@ else()
set(output_name "clang") set(output_name "clang")
endif() endif()

1
debian/patches/series vendored
View File

@ -20,6 +20,7 @@ silent-more-tests.diff
disable-display-PASS-UNSUPPORTED-XFAIL.diff disable-display-PASS-UNSUPPORTED-XFAIL.diff
fix-llvm-config-obj-src-root.patch fix-llvm-config-obj-src-root.patch
compiler-rt-path.diff compiler-rt-path.diff
0044-soname.diff
lldb-soname.diff lldb-soname.diff
lldb-libname.diff lldb-libname.diff
hurd-EIEIO-undef.diff hurd-EIEIO-undef.diff

9
debian/rules vendored
View File

@ -273,10 +273,8 @@ override_dh_auto_install:
# Only run on executable, not script # Only run on executable, not script
chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1`
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
mv libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT)
ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \
ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so
# cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ # cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \
# mv liblldb.so.$(LLVM_VERSION_FULL) liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \ # mv liblldb.so.$(LLVM_VERSION_FULL) liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \
@ -303,9 +301,6 @@ override_dh_auto_install:
# idem for the lldb python binding # idem for the lldb python binding
mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/lldb/ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/lldb/
mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)
cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so
# Remove things that CMake install but which aren't packaged yet, # Remove things that CMake install but which aren't packaged yet,
# or are packaged from the source or build tree. # or are packaged from the source or build tree.
mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \