Fixed _lldb.so missing import during lldb testsuite

This commit is contained in:
Pablo Oliveira 2016-06-10 07:49:40 +00:00
parent 23db80c5c6
commit 7369c720f1
3 changed files with 14 additions and 14 deletions

1
debian/changelog vendored
View File

@ -19,6 +19,7 @@ llvm-toolchain-snapshot (1:3.9~svn260851-2) UNRELEASED; urgency=medium
* Add python-six as a dependency of python-lldb (Closes: #825371)
(thanks to Askar Safin)
* Fix lldb symlinks
* Fix missing _lldb.so import during lldb testsuite
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 09 Mar 2016 19:30:30 +0100

View File

@ -1,13 +1,11 @@
Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile
+++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
@@ -191,7 +191,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
LLVMLibsOptions += -Wl,--no-undefined
# Link in python
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION)
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT)
ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
# Link GCC atomic helper library
LLVMLibsOptions += -latomic
--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -379,7 +379,7 @@
if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = ".so"
+ strLibFileExtn = "-3.9.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget)

View File

@ -21,6 +21,7 @@ disable-display-PASS-UNSUPPORTED-XFAIL.diff
fix-llvm-config-obj-src-root.patch
compiler-rt-path.diff
lldb-soname.diff
lldb-libname.diff
hurd-EIEIO-undef.diff
silent-MCJIIT-tests.diff
clang-analyzer-force-version.diff