From 3df4907513813eeb3d404745d123772bb602f364 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 27 Sep 2018 00:25:31 +0100 Subject: [PATCH 1/6] remove old package --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 0f861a19..cf8d43f8 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -4,7 +4,7 @@ set -e VERSION=7 DETAILED_VERSION=7-3 -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 libc++abi1-${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 libllvm-lto-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb" +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 libc++abi1-${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:" echo "sudo dpkg -i $LIST" L="" From adcb699efd6ca5c47626945be041bfa7132b579b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 27 Sep 2018 08:07:14 +0100 Subject: [PATCH 2/6] Install bash-completion --- debian/changelog | 1 + debian/clang-X.Y.links.in | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index db50c9e6..e3a2be5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ 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 -- Sylvestre Ledru Wed, 26 Sep 2018 14:32:41 +0100 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 From 4432e6b41e1adf5d0ce3b452e4bae803c1123933 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 30 Sep 2018 19:34:04 +0100 Subject: [PATCH 3/6] remove old arg std=c++0x --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 832aaab7..f81d566b 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 = @@ -290,9 +290,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)" \ From de067b22d4637f9f621aeac557231d1843068e6d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 2 Oct 2018 10:06:35 +0200 Subject: [PATCH 4/6] automate the version detection --- debian/qualify-clang.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 7d350ad1..125d0b96 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -2,8 +2,9 @@ # Stop at the first error set -e -VERSION=7 -DETAILED_VERSION=7~+rc1-1~exp3 +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 libc++abi1-${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:" echo "sudo dpkg -i $LIST" From d14272feb8a8a63f5385b16d4ae002cd3c408efe Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 2 Oct 2018 10:24:36 +0200 Subject: [PATCH 5/6] improve changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e3a2be5a..e3b1886e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ 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 + * Install bash-completion for clang -- Sylvestre Ledru Wed, 26 Sep 2018 14:32:41 +0100 From 0e066b184b64d1951caf723c525529a18fbc9cef Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 2 Oct 2018 10:25:15 +0200 Subject: [PATCH 6/6] Disable ocaml on armel --- debian/changelog | 1 + debian/control | 10 +++++----- debian/rules | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3b1886e..2c2af93c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-7 (1:7-4) unstable; urgency=medium 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 diff --git a/debian/control b/debian/control index 090139a4..88bb4984 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, 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-7-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armel armhf i386 ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Suggests: llvm-7-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-7-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index f81d566b..7790f80c 100755 --- a/debian/rules +++ b/debian/rules @@ -185,7 +185,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