proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-15 12:57:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the soname. No changes in the ABI, so, no need to update the soname

Browse Source 
(Closes: #747701)
This commit is contained in:
Sylvestre Ledru 2014-05-11 20:50:56 +00:00
parent 15fb7c9a27
commit 8f72440397
7 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-3.4 (1:3.4.1-2) unstable; urgency=medium
* Fix the soname. No changes in the ABI, so, no need to update the soname
(Closes: #747701)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 11 May 2014 17:29:22 +0200
llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium
* New upstream release. Note that only LLVM & Clang had a new release. * New upstream release. Note that only LLVM & Clang had a new release.

1
debian/libllvm3.4.install.in vendored
View File

@ -1 +1,2 @@
usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-3.4/lib/libLLVM-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/

2
debian/libllvm3.4.links.in vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1

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

@ -1,13 +1,32 @@
Index: llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile Index: llvm-toolchain-3.4-3.4.1/tools/llvm-shlib/Makefile
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.4~svn193982.orig/tools/llvm-shlib/Makefile 2013-11-04 09:46:03.312667676 +0100 --- llvm-toolchain-3.4-3.4.1.orig/tools/llvm-shlib/Makefile 2014-05-11 20:13:33.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn193982/tools/llvm-shlib/Makefile 2013-11-04 09:46:03.308667675 +0100 +++ llvm-toolchain-3.4-3.4.1/tools/llvm-shlib/Makefile 2014-05-11 20:36:51.662821231 +0200
@@ -76,7 +76,7 @@ @@ -10,6 +10,7 @@
LEVEL := ../..
LIBRARYNAME = LLVM-$(LLVMVersion)
+LIBRARYNAME_SONAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
LIBRARYALIASNAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX)
NO_BUILD_ARCHIVE := 1
@@ -47,6 +48,10 @@
$(ProjLibsOptions) $(LLVMLibsOptions) $(LIBS)
mv $(LibName.SO) $(LibName.SO).1
ln -s $(notdir $(LibName.SO)).1 $(LibName.SO)
+ # Crappy workaround. I just need to fix Debian quickly
+ ln -s $(notdir $(LibName.SO)).1 $(SharedLibDir)/lib$(LIBRARYNAME_SONAME).so.1
+
+
ifeq ($(HOST_OS),Darwin)
# set dylib internal version number to llvmCore submission number
@@ -78,7 +83,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
# Add soname to the library. # Add soname to the library.
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME_SONAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions
endif endif
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))

13
debian/patches/compiler-rt-path.diff vendored Normal file
View File

@ -0,0 +1,13 @@
Index: llvm-toolchain-3.4-3.4.1/compiler-rt/make/platform/clang_linux.mk
===================================================================
--- llvm-toolchain-3.4-3.4.1.orig/compiler-rt/make/platform/clang_linux.mk 2013-10-03 10:31:14.000000000 +0200
+++ llvm-toolchain-3.4-3.4.1/compiler-rt/make/platform/clang_linux.mk 2014-05-11 21:15:17.379960560 +0200
@@ -11,7 +11,7 @@
# cross compilers). For now, we just find the target architecture of the
# compiler and only define configurations we know that compiler can generate.
CompilerTargetTriple := $(shell \
- $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2)
+ LD_LIBRARY_PATH=../build-llvm/Release/lib $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2)
ifeq ($(CompilerTargetTriple),)
$(error "unable to infer compiler target triple for $(CC)")
endif

1
debian/patches/series vendored
View File

@ -37,3 +37,4 @@ lldb-link-atomic.diff
0007-install-dejagnu-files.patch 0007-install-dejagnu-files.patch
fix-llvm-config-obj-src-root.patch fix-llvm-config-obj-src-root.patch
scan-build-fix-clang-detection.diff scan-build-fix-clang-detection.diff
compiler-rt-path.diff

1
debian/rules vendored
View File

@ -261,6 +261,7 @@ override_dh_auto_install:
fi; \ fi; \
rm -f libLLVM-$(LLVM_VERSION).so; \ rm -f libLLVM-$(LLVM_VERSION).so; \
ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so; \ ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so; \
ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)
rm -f libclang.so rm -f libclang.so
# cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty) # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty)