* Fix the path to lldb-server (to lldb-server-3.9) (Closes: #846638)

* Disable libedit usage in lldb because of garbage (Closes: #846616)
This commit is contained in:
Sylvestre Ledru 2016-12-20 09:13:45 +00:00
commit 2d31f5815c
4 changed files with 24 additions and 4 deletions

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ llvm-toolchain-3.9 (1:3.9.1-2) UNRELEASED; urgency=medium
* debian/orig-tar.sh: less verbose
* Remove the info section from the generated manpages (Closes: #846269)
* Fix the path to lldb-server (to lldb-server-3.9) (Closes: #846638)
* Disable libedit usage in lldb because of garbage (Closes: #846616)
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 17 Dec 2016 17:55:44 +0100

13
debian/patches/lldb-server-path.diff vendored Normal file
View File

@ -0,0 +1,13 @@
Index: llvm-toolchain-3.8-3.8.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-3.8-3.8.1.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-3.8-3.8.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -40,7 +40,7 @@
#if defined(__APPLE__)
# define DEBUGSERVER_BASENAME "debugserver"
#else
-# define DEBUGSERVER_BASENAME "lldb-server"
+# define DEBUGSERVER_BASENAME "lldb-server-3.9"
#endif
#if defined (HAVE_LIBCOMPRESSION)

View File

@ -43,3 +43,5 @@ upstream-msan-prevent-initialization-failure.diff
upstream-asan-msan-fix-reallocation-logic.diff
lit-force-lang.diff
clang-arm-default-vfp3-on-armv7a.patch
clang-arm-default-vfp3-on-armv7a.patch
lldb-server-path.diff

9
debian/rules vendored
View File

@ -120,6 +120,9 @@ LLDB_DISABLE_ARCHS := hurd-i386 ia64 ppc64el powerpc s390x sparc64 mips64el ppc6
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
# Disable LLDB for this arch.
LLDB_ENABLE=no
else
# See https://llvm.org/bugs/show_bug.cgi?id=28898
CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON
endif
LLD_ENABLE=NO
@ -270,13 +273,13 @@ build_doc:
cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \
done
help2man --version-string=$(LLVM_VERSION) --no-discard-stderr clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
help2man --version-string=$(LLVM_VERSION) --no-discard-stderr clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
help2man --version-string=$(LLVM_VERSION) --no-info --no-discard-stderr clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
help2man --version-string=$(LLVM_VERSION) --no-info --no-discard-stderr clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols"; \
for f in $$CMDS; do \
echo "Generating manpage of $$f"; \
LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --version-string=$(LLVM_VERSION) --no-discard-stderr $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) --no-discard-stderr $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
done
override_dh_auto_install: