diff --git a/debian/changelog b/debian/changelog index 43a19cc0..3babd56d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -llvm-toolchain-3.8 (1:3.8.1-14) UNRELEASED; urgency=medium +llvm-toolchain-3.8 (1:3.8.1-14) unstable; urgency=medium - * (Closes: #842142). + * libclang-common-3.9-dev: missing multilib binaries for the sanatizer + libraries (Closes: #841923) + Many thanks to Norbert Lange for the changes - -- Gianfranco Costamagna Fri, 04 Nov 2016 12:16:22 +0100 + -- Sylvestre Ledru Sat, 05 Nov 2016 14:31:41 +0100 llvm-toolchain-3.8 (1:3.8.1-13) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7db7f840..f9c5319c 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, lsb-release, patchutils, diffstat, xz-utils, python-dev, libedit-dev, swig, python-six, python-sphinx, ocaml-nox, binutils-dev, libjsoncpp-dev, - lcov, procps, help2man, dh-ocaml, zlib1g-dev + lcov, procps, help2man, dh-ocaml, zlib1g-dev, + g++-multilib Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, libllvm-3.8-ocaml-dev Standards-Version: 3.9.8 diff --git a/debian/rules b/debian/rules index 55c51de2..d553e734 100755 --- a/debian/rules +++ b/debian/rules @@ -445,7 +445,8 @@ endif override_dh_shlibdeps: # cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps +# Ignore asan libraries. They would trigger dependencies to multiarch libraries + dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan override_dh_installman: dh_installman