From 8573df8c5e536b5e936a89591ca4bd9a19befc75 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 8 Nov 2021 14:12:07 +0100 Subject: [PATCH 1/6] Fix an autopkgtest test (Closes: #997902) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 52a4b8c0..3d1935f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-13 (1:13.0.0-9) unstable; urgency=medium * Upload to unstable (all green on exp) + * Fix an autopkgtest test (Closes: #997902) -- Sylvestre Ledru Mon, 08 Nov 2021 14:09:25 +0100 From 6fb9dd580c988fd3d58ebc787c9e98876497c554 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 11 Nov 2021 13:20:55 +0100 Subject: [PATCH 2/6] fix typos --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 61195d17..e7744685 100755 --- a/debian/rules +++ b/debian/rules @@ -556,7 +556,7 @@ override_dh_auto_configure: preconfigure FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \ if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \ - echo "mistmatch of version. Found: $$FOUND_VERSION / Expected: $(LLVM_VERSION_FULL)"; \ + echo "mismatch of version. Found: $$FOUND_VERSION / Expected: $(LLVM_VERSION_FULL)"; \ exit 1; \ fi @@ -724,7 +724,7 @@ endif mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/clang_linux/ mkdir -p $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux/ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/share/ -# On some archs, the sanatizers are not built. As we explicitly includes some txt files, create +# On some archs, the sanitizers are not built. As we explicitly includes some txt files, create # a fake txt to make sure it doesn't fail echo "The *.txt files, if available, contain helper to override some of the errors messages." > $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/README.txt echo "Please visit https://github.com/google/sanitizers/wiki/AddressSanitizer for help" >> $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/README.txt From 90755700695a1c7010910cb0715807e01ae1afd5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 10 Nov 2021 21:27:55 +0100 Subject: [PATCH 3/6] Document some recent changes --- debian/README.source | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/README.source b/debian/README.source index a5b685cc..fbd46fa2 100644 --- a/debian/README.source +++ b/debian/README.source @@ -4,6 +4,13 @@ as possible from upstream. However, because of the objectives of Debian, besides paths, some changes are made. +The Debian packaging is also used by apt.llvm.org. + +From 12.0.1-10 & 13.0.0-9, the build system use the runtimes build system. +This is now the upstream preferred way to build llvm. +It means that some projects like libc++ or compiler-rt are built once clang +is built. + = File names = * To make sure that most of the llvm-toolchain packages are co-installable, From 88d3b7d9fd8e64a3bd681343ddcf1cfa3389125c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 10 Nov 2021 21:29:22 +0100 Subject: [PATCH 4/6] fix a typo --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index e7744685..f143e742 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,7 @@ include /usr/share/dpkg/buildflags.mk # We use a stage2 build. It means that a first clang is built using gcc, # a second clang is built with the first -# And the various compoments are built using the second clang. +# And the various components are built using the second clang. # See https://llvm.org/docs/AdvancedBuilds.html # collect additional flags for all stages all builds From 83e6a6baf092412acbbb95571376aab8d41bdc70 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 10 Nov 2021 21:30:33 +0100 Subject: [PATCH 5/6] fix a typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3d1935f4..2b49bd52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -600,7 +600,7 @@ llvm-toolchain-12 (1:12.0.0~++rc4-1) unstable; urgency=medium llvm-toolchain-12 (1:12.0.0~++rc3-4) unstable; urgency=medium - * dont' fail fsanitize=thread on i386, not supported + * Don't fail fsanitize=thread on i386, not supported * Don't hard fail on z3 failures with "set -e" at the begin, if z3 support is not available we do fail and exit testsuite without checking the log * Don't force gcc-11 anymore on riscv64, gcc-10 has the fixes now From 66767e15bb69da784caadfab34ef0ca1ed9e8ee9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 11 Nov 2021 22:45:36 +0100 Subject: [PATCH 6/6] Add back -DLLVM_VERSION_SUFFIX=. Useless for 13 but necessary for snapshot Otherwise, it adds "git" to the libs --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2b49bd52..582a9108 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-13 (1:13.0.0-10) unstable; urgency=medium + + * Add back -DLLVM_VERSION_SUFFIX=. Useless for 13 but necessary for snapshot + Otherwise, it adds "git" to the libs + + -- Sylvestre Ledru Thu, 11 Nov 2021 22:45:25 +0100 + llvm-toolchain-13 (1:13.0.0-9) unstable; urgency=medium * Upload to unstable (all green on exp) diff --git a/debian/rules b/debian/rules index f143e742..0b8a84b4 100755 --- a/debian/rules +++ b/debian/rules @@ -478,6 +478,7 @@ override_dh_auto_configure: preconfigure $(PRE_PROCESS_CONF) $(CMAKE_BIN) -S llvm/ -B $(TARGET_BUILD) \ -G $(GENERATOR) \ -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \ + -DLLVM_VERSION_SUFFIX= \ -DCMAKE_SUPPRESS_REGENERATION=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS="$(STAGE_1_CFLAGS)" \