diff --git a/debian/changelog b/debian/changelog index 4b8bcb73..e1d4201a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,67 @@ llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp1) experimental -- Sylvestre Ledru Sun, 13 Feb 2022 23:25:57 +0100 +llvm-toolchain-14 (1:14.0.4-3) unstable; urgency=medium + + * Fix GRPC installation path and files + + -- Gianfranco Costamagna Tue, 31 May 2022 12:09:28 +0200 + +llvm-toolchain-14 (1:14.0.4-2) unstable; urgency=low + + * Add breaks/replaces for grpc binaries being placed in another package in Ubuntu + * Fix GRPC installation for ports architectures + * Add support for Ubuntu kinetic + * rules: take some patches from Ubuntu to save extra space during build + + -- Gianfranco Costamagna Sun, 29 May 2022 12:53:47 +0200 + +llvm-toolchain-14 (1:14.0.4-1) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Enable GRPC build dependency only on supported targets + + [ Sylvestre Ledru ] + * New upstream release + + -- Sylvestre Ledru Wed, 25 May 2022 08:49:20 +0200 + +llvm-toolchain-14 (1:14.0.3-2) unstable; urgency=medium + + * Fix an autopkgtest on arm (Closes:# 1010716) + Thanks to Pino Toscano for the patch + * Fix the search path for hip (Closes: #1010467) + * Add the option -DLLVM_ENABLE_CURL=ON + See https://github.com/llvm/llvm-project/issues/55289 + (LP: #1971743) + + -- Sylvestre Ledru Mon, 09 May 2022 20:40:39 +0200 + +llvm-toolchain-14 (1:14.0.3-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Fri, 29 Apr 2022 09:23:16 +0200 + +llvm-toolchain-14 (1:14.0.2-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Wed, 27 Apr 2022 08:36:00 +0200 + +llvm-toolchain-14 (1:14.0.1-1) unstable; urgency=medium + + * New upstream release + Fixes the ABI issues + + -- Sylvestre Ledru Wed, 13 Apr 2022 09:33:24 +0200 + +llvm-toolchain-14 (1:14.0.0-1) unstable; urgency=medium + + * New stable release + + -- Sylvestre Ledru Wed, 23 Mar 2022 08:41:26 +0100 + llvm-toolchain-14 (1:14.0.0~+rc4-1) unstable; urgency=medium * New snapshot release (rc3 isn't a thing) diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index d412750d..5ac12885 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -9,6 +9,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a # clangd grpc architectures -[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a -[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a -[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a +[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libclangdRemoteIndexProto.a +[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libclangdRemoteIndexServiceProto.a +[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libclangdMonitoringServiceProto.a diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index 81396058..b197f9ad 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,3 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1* /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 - diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index fdfccb94..b06271e0 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -329,6 +329,13 @@ if ! llvm-dis-$VERSION < foo.bc|grep -q "lli foo"; then exit 1 fi +# test if this is built with CURL +llvm-debuginfod-find-$VERSION --executable=1 5d016364c1cb69dd &> foo.log || true +if grep -q "No working HTTP" foo.log; then + echo "llvm-debuginfod-find isn't built with curl support" + exit 1 +fi + echo '#include ' > foo.c clang-$VERSION -c foo.c @@ -350,9 +357,11 @@ void increment(atomic_size_t *arg) { clang-$VERSION -v -c foo.c &> /dev/null echo "#include " > foo.cc -NBLINES=$(clang++-$VERSION -P -E foo.cc|wc -l) -if test $NBLINES -lt 100; then - echo "Error: more than 100 lines should be returned" +NBLINES=$(clang++-$VERSION -P -E foo.cc|grep .|wc -l) +if test $NBLINES -lt 60; then + echo "Error: more than 60 non-empty lines should be returned" + echo "output:" + clang++-$VERSION -P -E foo.cc exit 42 fi diff --git a/debian/rules b/debian/rules index ce5d59e2..c1383272 100755 --- a/debian/rules +++ b/debian/rules @@ -602,6 +602,7 @@ override_dh_auto_configure: preconfigure -DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \ -DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k" \ -DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \ + -DBOOTSTRAP_LLVM_ENABLE_CURL=ON \ -DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \ -DBOOTSTRAP_LIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \ -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ @@ -808,6 +809,7 @@ endif # Probably useless rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/six.py + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/local/lib/python*/*-packages/six.py rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/__pycache__/ \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/*/__pycache__/ @@ -1110,5 +1112,7 @@ override_dh_auto_clean: fi : # for some reason, the docs are written to debian/usr and debian/man ... rm -rf debian/usr debian/man + : # remove extra stamps + rm -f debian-*-build .PHONY: override_dh_strip preconfigure debian-full-build debian-libfuzzer-build debian-libclc-build