diff --git a/debian/changelog b/debian/changelog index 009e2351..bbb89f01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ llvm-toolchain-snapshot (1:8~svn342269-2) UNRELEASED; urgency=medium doesn't use LLVM LTO * remove old Replaces/Breaks * Standards-Version: 4.2.1 + * Backport a fix to improve scan-build code error. + Thanks to Roman Lebedev for the fix(Closes: #909662) + * Remove bat files https://bugs.llvm.org/show_bug.cgi?id=30755 + * Install bash-completion for clang + * Disable ocaml on armel -- Sylvestre Ledru Fri, 21 Sep 2018 22:48:47 +0200 @@ -105,6 +110,16 @@ llvm-toolchain-snapshot (1:8~svn340819-1) unstable; urgency=medium -- Sylvestre Ledru Tue, 28 Aug 2018 16:28:24 +0200 +llvm-toolchain-7 (1:7-4) unstable; urgency=medium + + * Backport a fix to improve scan-build code error. + Thanks to Roman Lebedev for the fix(Closes: #909662) + * Remove bat files https://bugs.llvm.org/show_bug.cgi?id=30755 + * Install bash-completion for clang + * Disable ocaml on armel + + -- Sylvestre Ledru Wed, 26 Sep 2018 14:32:41 +0100 + llvm-toolchain-7 (1:7-3) unstable; urgency=medium * Fix a syntax issue in a scan-build patch diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index 4ba8a3b9..47b41e10 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,2 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang usr/lib/llvm-@LLVM_VERSION@/bin/clang-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/clang usr/lib/cmake/clang-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/share/clang/bash-autocomplete.sh etc/bash_completion.d/clang-@LLVM_VERSION@ \ No newline at end of file diff --git a/debian/control b/debian/control index de9f9101..0aa01875 100644 --- a/debian/control +++ b/debian/control @@ -13,10 +13,10 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python-recommonmark, doxygen, gfortran, - ocaml-nox [amd64 arm64 armel armhf i386 ppc64el s390x], - ocaml-findlib [amd64 arm64 armel armhf i386 ppc64el s390x], - libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x], - dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x], + ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x], + ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x], + libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], + dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ @@ -312,7 +312,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-8-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Suggests: llvm-8-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-8-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 254201de..c74a5b08 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -2,9 +2,8 @@ # Stop at the first error set -e -VERSION=8 -DETAILED_VERSION=8~+rc1-1~exp2 - +VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") +DETAILED_VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p") LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm7_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" diff --git a/debian/rules b/debian/rules index e7d28a62..86417cf3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) LDFLAGS_EXTRA = -CXXFLAGS_EXTRA = -std=c++0x +CXXFLAGS_EXTRA = CONFIGURE_EXTRA = CMAKE_EXTRA = @@ -188,7 +188,7 @@ endif DH_OPTIONS= OCAML_ENABLE= no -OCAML_ARCHS := amd64 arm64 armel armhf i386 ppc64el s390x +OCAML_ARCHS := amd64 arm64 armhf i386 ppc64el s390x ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) # Enable OCAML for this arch. OCAML_ENABLE=yes @@ -293,9 +293,9 @@ override_dh_auto_configure: preconfigure cov-configure --compiler clang --comptype clang; \ cov-configure --compiler gcc-$(GCC_VERSION) --comptype gcc; \ cov-configure --compiler g++-$(GCC_VERSION) --comptype gcc; \ - cov-configure -co /usr/bin/g++-$(GCC_VERSION) --comptype gcc -- -std=c++0x -fPIC -std=c++11; \ + cov-configure -co /usr/bin/g++-$(GCC_VERSION) --comptype gcc -- -fPIC -std=c++11; \ cov-configure -co /usr/bin/gcc-$(GCC_VERSION) --comptype gcc -- -fPIC; \ - cov-configure -co /usr/bin/g++-$(GCC_VERSION) --comptype gcc -- -std=c++0x -fPIC -std=c++11 -fno-exceptions; \ + cov-configure -co /usr/bin/g++-$(GCC_VERSION) --comptype gcc -- -fPIC -std=c++11 -fno-exceptions; \ cov-configure -co /usr/bin/g++-$(GCC_VERSION) --comptype gcc --template \ --xml-option append_arg:"--ppp_translator" \ --xml-option append_arg:"replace/llvm::AlignOf::Alignment/(llvm::AlignOf::Alignment)" \