From 7369c720f1f0b18d38bf2291efae7b99617ee0df Mon Sep 17 00:00:00 2001 From: Pablo Oliveira Date: Fri, 10 Jun 2016 07:49:40 +0000 Subject: [PATCH] Fixed _lldb.so missing import during lldb testsuite --- debian/changelog | 3 ++- debian/patches/lldb-libname.diff | 24 +++++++++++------------- debian/patches/series | 1 + 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3208aac..25724cd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,8 @@ llvm-toolchain-snapshot (1:3.9~svn260851-2) UNRELEASED; urgency=medium [ Pablo Oliveira ] * Add python-six as a dependency of python-lldb (Closes: #825371) (thanks to Askar Safin) - * Fix lldb symlinks + * Fix lldb symlinks + * Fix missing _lldb.so import during lldb testsuite -- Sylvestre Ledru Wed, 09 Mar 2016 19:30:30 +0100 diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index e0f84e3b..196399b7 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -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) diff --git a/debian/patches/series b/debian/patches/series index a880e1ac..c8ab2b4d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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