From da19aa0c89c2628f38f07d03a7e7db9f9bbb9c9d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 Dec 2017 10:46:32 +0000 Subject: [PATCH] Bring back the libedit support in lldb Fix upstream bug https://bugs.llvm.org/show_bug.cgi?id=35291 --- debian/changelog | 2 ++ debian/rules | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9a16647d..dd35e9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-snapshot (1:6.0~svn315736-2) unstable; urgency=medium * Create clang-tools-6.0 and move the various clang tools into it clang-tools-6.0 depends on clang-6.0. This might affect some packages. (Closes: #836397) + * Bring back the libedit support in lldb + Fix upstream bug https://bugs.llvm.org/show_bug.cgi?id=35291 * Also ship ld64.lld and wasm-ld in the lld-X.Y package * Update d/rules to reflect the move of libfuzzer into compiler-rt * Update of the copyright file (Closes: #878502) diff --git a/debian/rules b/debian/rules index 2843784e..1547bb69 100755 --- a/debian/rules +++ b/debian/rules @@ -151,7 +151,8 @@ ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) LLDB_ENABLE=no else # See https://llvm.org/bugs/show_bug.cgi?id=28898 - CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON +# Enable it again as it seems it is fixed upstream https://bugs.llvm.org/show_bug.cgi?id=35291 +# CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON endif LLD_ENABLE=yes