From ee40c18b2193b7d899ccdf9d53dd74c14a891900 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Wed, 10 Nov 2021 22:11:03 +0100 Subject: [PATCH 01/13] Use 'command -v' instead of deprecated 'which' --- debian/llvm-X.Y-runtime.postinst.in | 2 +- debian/llvm-X.Y-runtime.prerm.in | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/llvm-X.Y-runtime.postinst.in b/debian/llvm-X.Y-runtime.postinst.in index 22326b1b..a974e949 100644 --- a/debian/llvm-X.Y-runtime.postinst.in +++ b/debian/llvm-X.Y-runtime.postinst.in @@ -3,7 +3,7 @@ set -e if test "$1" = "configure"; then - if which update-binfmts >/dev/null; then + if command -v update-binfmts >/dev/null; then update-binfmts --import llvm-@LLVM_VERSION@-runtime.binfmt || true fi fi diff --git a/debian/llvm-X.Y-runtime.prerm.in b/debian/llvm-X.Y-runtime.prerm.in index 4b7d8eb7..35fc5ca8 100644 --- a/debian/llvm-X.Y-runtime.prerm.in +++ b/debian/llvm-X.Y-runtime.prerm.in @@ -3,7 +3,7 @@ set -e if test "$1" = "remove"; then - if which update-binfmts >/dev/null; then + if command -v update-binfmts >/dev/null; then update-binfmts --package llvm-@LLVM_VERSION@-runtime \ --remove llvm-@LLVM_VERSION@-runtime.binfmt /usr/bin/lli-@LLVM_VERSION@ || true if test -f /var/lib/binfmts/llvm-@LLVM_VERSION@.binfmt; then diff --git a/debian/rules b/debian/rules index 61195d17..43209da5 100755 --- a/debian/rules +++ b/debian/rules @@ -195,7 +195,7 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif -ifeq ($(shell which llvm-spirv),) +ifeq ($(shell command -v llvm-spirv),) LLVM_SPIRV_INSTALLED = no else LLVM_SPIRV_INSTALLED = yes From b616a7f16b86af672b72677d880966eb49fc70cc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Jan 2022 21:35:04 +0100 Subject: [PATCH 02/13] bis: Fix the cmake file with the mlir introducing --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d08f663c..429813ff 100755 --- a/debian/rules +++ b/debian/rules @@ -791,7 +791,7 @@ endif sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Also disable mlir-* checks in the cmake - sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake From 9f35a80df6eb8ab85d1dd9ff9051f87a1ec742af Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Jan 2022 23:13:42 +0100 Subject: [PATCH 03/13] fix changelog --- debian/changelog | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40c390e8..3d7b14e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,10 +10,6 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp3) experimental; urgency=medium and mlir-13-tools) * Install bfd plugins in /usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so - * Build and ship MLIR as 3 new packages (libmlir-13-dev, libmlir-13 - and mlir-13-toolso - * Install bfd plugins in - /usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so -- Sylvestre Ledru Fri, 31 Dec 2021 12:22:38 +0100 From 04c09a8af8d52db36ea8d08bf0fbed5215e32e5a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 11 Jan 2022 23:45:18 +0100 Subject: [PATCH 04/13] remove the typo -DLVVM_ENABLE_ZLIB=OFF as it seems that it working with the default value --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 429813ff..f4fa7e2a 100755 --- a/debian/rules +++ b/debian/rules @@ -494,7 +494,6 @@ override_dh_auto_configure: preconfigure -DLLVM_ENABLE_RUNTIMES="$(RUNTIMES_LIST)" \ -DLLVM_ENABLE_PIC=ON \ -DLLVM_ENABLE_RTTI=ON \ - -DLVVM_ENABLE_ZLIB=OFF \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_USE_RELATIVE_PATHS_IN_FILES=ON \ From 43d03058ff79806ab0ac1227e74f154493f78638 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 10 Jan 2022 21:37:19 +0100 Subject: [PATCH 05/13] Explicitly link against -latomic on all ports, not only the Linux ones --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3d7b14e2..d9362112 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium + + * Explicitly link against -latomic on all ports, not only the Linux ones. + + -- Samuel Thibault Mon, 10 Jan 2022 21:36:34 +0100 + llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium * Fix the cmake file with the mlir introducing diff --git a/debian/rules b/debian/rules index f4fa7e2a..c5fa0418 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mipsel powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 armel mipsel powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages From 653f1a56eae335f4a483808f9883ecaa873d19b4 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 12 Jan 2022 23:17:43 +0100 Subject: [PATCH 06/13] debian/rules: Disable 64bit runtime build on hurd-i38 --- debian/changelog | 6 +++++- debian/rules | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d9362112..437fd607 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium + [ Samuel Thibault ] * Explicitly link against -latomic on all ports, not only the Linux ones. - -- Samuel Thibault Mon, 10 Jan 2022 21:36:34 +0100 + [ Pino Toscano ] + * debian/rules: Disable 64bit runtime build on hurd-i386 (Closes: #1003081). + + -- Samuel Thibault Wed, 12 Jan 2022 23:16:43 +0100 llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 9138af33..dacaf177 100755 --- a/debian/rules +++ b/debian/rules @@ -185,6 +185,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH),x32)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnux32 endif +ifneq (,$(filter $(DEB_HOST_ARCH),hurd-i386)) + STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON +endif + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0) control_vars = '-Vdep:devlibs=libstdc++-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev' \ '-Vdep:devlibs-objc=libobjc-$(GCC_VERSION)-dev' From b02fa8358fbb523ce874975fe8ede6e99e534d9a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 12 Jan 2022 23:27:32 +0100 Subject: [PATCH 07/13] Stop hardcoding -DCMAKE_SYSTEM_NAME=Linux as cmake parameter as it breaks stage2 builds on non-Linux architectures. --- debian/changelog | 5 +++++ debian/rules | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9362112..954e13fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium + [ Samuel Thibault ] * Explicitly link against -latomic on all ports, not only the Linux ones. + [ Pino Toscano ] + * Stop hardcoding -DCMAKE_SYSTEM_NAME=Linux as cmake parameter, as it breaks + stage2 builds on non-Linux architectures + -- Samuel Thibault Mon, 10 Jan 2022 21:36:34 +0100 llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 9138af33..18c80cf5 100755 --- a/debian/rules +++ b/debian/rules @@ -523,8 +523,8 @@ override_dh_auto_configure: preconfigure -DLIBOMP_ENABLE_RTTI=OFF \ -DLIBOMP_OMPT_SUPPORT=OFF \ $(CMAKE_EXTRA) \ - -DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ - -DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ + -DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ + -DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ -DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \ -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI" \ @@ -552,8 +552,8 @@ override_dh_auto_configure: preconfigure -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ -DBOOTSTRAP_PYTHON_EXECUTABLE=/usr/bin/python3 \ $(BOOTSTRAP_CMAKE_EXTRA) \ - -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ - -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" + -DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ + -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS) -L$(STAGE_1_LIB_DIR);-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" 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 \ From 129fe31aaba796ce2f5412707a5b4f6b50bca5ee Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 13 Jan 2022 21:12:42 +0100 Subject: [PATCH 08/13] simplify the patch --- debian/patches/remove-test-freezing.diff | 43 +++++------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/debian/patches/remove-test-freezing.diff b/debian/patches/remove-test-freezing.diff index 1ebc19ce..53e154c4 100644 --- a/debian/patches/remove-test-freezing.diff +++ b/debian/patches/remove-test-freezing.diff @@ -1,35 +1,10 @@ -Index: llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp +Index: llvm-toolchain-snapshot_14~++20211115123243+1e77b09538c1/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp =================================================================== ---- llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp -+++ llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp -@@ -1,30 +0,0 @@ --// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s -- --#include -- --#if !defined(__GLIBC_PREREQ) --#define __GLIBC_PREREQ(a, b) 0 --#endif -- --// getauxval() used instead of sysconf() in GetPageSize() is defined starting --// glbc version 2.16. --// Does not work with 2.31 and above at it calls sysconf for SIGSTKSZ. --#if __GLIBC_PREREQ(2, 16) && !__GLIBC_PREREQ(2, 31) --extern "C" long sysconf(int name) { -- fprintf(stderr, "sysconf wrapper called\n"); -- return 0; --} --#endif -- --int main() { -- // All we need to check is that the sysconf() interceptor defined above was -- // not called. Should it get called, it will crash right there, any -- // instrumented code executed before sanitizer init is finished will crash -- // accessing non-initialized sanitizer internals. Even if it will not crash -- // in some configuration, it should never be called anyway. -- fprintf(stderr, "Passed\n"); -- // CHECK-NOT: sysconf wrapper called -- // CHECK: Passed -- // CHECK-NOT: sysconf wrapper called -- return 0; --} +--- llvm-toolchain-snapshot_14~++20211115123243+1e77b09538c1.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp ++++ llvm-toolchain-snapshot_14~++20211115123243+1e77b09538c1/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp +@@ -1,4 +1,5 @@ + // RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s ++// XFAIL: * + + #include + From 38be44b0dc0f54854a544be39a3d915601c28256 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 14 Jan 2022 10:15:41 +0100 Subject: [PATCH 09/13] Fix armel build On armel, DEB_HOST_ARCH_CPU is the generic arm actually, so we need to use DEB_HOST_ARCH to precisely filter archs. Fixes 43d03058ff79806ab0ac1227e74f154493f78638 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index dd8cdc9e..0eab5664 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 armel mipsel powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages From 84ad3d3390c70a8c986b8f8a40f86e415e541a12 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 19 Jan 2022 23:46:33 +0100 Subject: [PATCH 10/13] Lower the debhelper dep to 10 for debian stretch --- debian/changelog | 7 +++++-- debian/control | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd75f350..abb4a586 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium [ Pino Toscano ] * debian/rules: Disable 64bit runtime build on hurd-i386 (Closes: #1003081). - - -- Samuel Thibault Mon, 10 Jan 2022 21:36:34 +0100 + + [ Sylvestre Ledru ] + * Lower the debhelper dep to 10 for debian stretch + + -- Sylvestre Ledru Wed, 19 Jan 2022 23:46:10 +0100 llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium diff --git a/debian/control b/debian/control index daefb7af..e8892dd6 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru , Gianfranco Costamagna -Build-Depends: debhelper (>= 11.0), cmake, ninja-build, +Build-Depends: debhelper (>= 10.0), cmake, ninja-build, chrpath, texinfo, sharutils, libelf-dev, libffi-dev, From 65486a1d607489b3a97e6b395f2e7a32af8834ef Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 21 Jan 2022 00:13:59 +0100 Subject: [PATCH 11/13] Rename ocaml-nox => ocaml-base (Closes: #1002609) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index abb4a586..4763d471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium [ Sylvestre Ledru ] * Lower the debhelper dep to 10 for debian stretch + * Rename ocaml-nox => ocaml-base (Closes: #1002609) -- Sylvestre Ledru Wed, 19 Jan 2022 23:46:10 +0100 diff --git a/debian/control b/debian/control index e8892dd6..06e90f7e 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-recommonmark, doxygen, gfortran, - ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], + ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], From e3f1e8fd708222482a8c717cf6733af565d44b78 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 21 Jan 2022 10:28:33 +0100 Subject: [PATCH 12/13] New rc --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4763d471..5cc39ad5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium +llvm-toolchain-13 (1:13.0.1~+rc3-1~exp1) experimental; urgency=medium [ Samuel Thibault ] * Explicitly link against -latomic on all ports, not only the Linux ones. @@ -9,10 +9,11 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium * debian/rules: Disable 64bit runtime build on hurd-i386 (Closes: #1003081). [ Sylvestre Ledru ] + * New rc * Lower the debhelper dep to 10 for debian stretch * Rename ocaml-nox => ocaml-base (Closes: #1002609) - -- Sylvestre Ledru Wed, 19 Jan 2022 23:46:10 +0100 + -- Sylvestre Ledru Thu, 13 Jan 2022 21:17:23 +0100 llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium From 602e8c3621e19c6509d46bf052977da7040f5961 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 21 Jan 2022 18:27:50 +0100 Subject: [PATCH 13/13] Remove Build-Conflicts: ocaml --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5cc39ad5..2b3babb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ llvm-toolchain-13 (1:13.0.1~+rc3-1~exp1) experimental; urgency=medium * New rc * Lower the debhelper dep to 10 for debian stretch * Rename ocaml-nox => ocaml-base (Closes: #1002609) + * Remove Build-Conflicts: ocaml -- Sylvestre Ledru Thu, 13 Jan 2022 21:17:23 +0100 diff --git a/debian/control b/debian/control index 06e90f7e..421b04ff 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386] # "| hello" is for older buster/bionic distros without spirv support -Build-Conflicts: oprofile, ocaml +Build-Conflicts: oprofile Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot