diff --git a/debian/README b/debian/README index 654ba44c..3f514d5b 100644 --- a/debian/README +++ b/debian/README @@ -9,7 +9,7 @@ The current snapshot release is maintained in the "snapshot" branch. The easiest way to get all branches is probably to have one clone per version: -for f in 14 15 16 snapshot; do +for f in 14 15 16 17 snapshot; do git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f done diff --git a/debian/changelog b/debian/changelog index f8a8efd2..06e99225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,21 +14,48 @@ llvm-toolchain-snapshot (1:18~++20230818040015+c931f2e6fd0c-1~exp1) experimental -- Sylvestre Ledru Fri, 18 Aug 2023 16:00:36 +0200 -llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium - * Fix for real the libclang-rt-17-dev issue + * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 + * Explicitly depend on libcurl4-openssl-dev + Thanks to Samuel Henrique for the fix - -- Sylvestre Ledru Mon, 24 Jul 2023 08:33:29 +0200 + -- Sylvestre Ledru Wed, 06 Sep 2023 22:44:15 +0200 -llvm-toolchain-snapshot (1:17~++20230721092305+2ce662c5d596-1~exp1) experimental; urgency=medium +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable wasm support on powerpc and powerpcspe + * Remove powerpc from BINUTILS_GOLD_ARCHS again + + [ Sylvestre Ledru ] + * new upstream release + * Disable python3-lldb on mips64el to unbreak the build + + -- Sylvestre Ledru Tue, 05 Sep 2023 14:42:18 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Tue, 22 Aug 2023 19:22:57 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium + + * debian/tests/control: update gcc to 10 => 13 + + -- Sylvestre Ledru Sat, 19 Aug 2023 10:07:19 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium * New snapshot release: * Fix the libclang-rt-17-dev: ships /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in libclang-rt-17-dev-wasm* (closes: #1041388) * Also install llvm-debuginfod in llvm-X.Y + * Fix for real the libclang-rt-17-dev issue - -- Sylvestre Ledru Fri, 21 Jul 2023 09:26:43 +0200 + -- Sylvestre Ledru Tue, 15 Aug 2023 19:25:12 +0000 llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index e556f5d7..503a2339 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-17 Section: devel Priority: optional Rules-Requires-Root: no @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], - libcurl4-dev, + libcurl4-openssl-dev | libcurl-dev, libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], @@ -35,8 +35,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ -Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot +Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 17 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17 # ------------- clang ------------- diff --git a/debian/control.in b/debian/control.in index fc183864..5ed74e57 100644 --- a/debian/control.in +++ b/debian/control.in @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], - libcurl4-dev, + libcurl4-openssl-dev | libcurl-dev, libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 189482ad..69dcd4c8 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,10 +1,10 @@ #!/bin/sh -ORIG_VERSION=15 -TARGET_VERSION=16 -ORIG_VERSION_2=15_0 -TARGET_VERSION_2=16_0 -ORIG_VERSION_3=150 -TARGET_VERSION_3=160 +ORIG_VERSION=16 +TARGET_VERSION=17 +ORIG_VERSION_2=16_0 +TARGET_VERSION_2=17_0 +ORIG_VERSION_3=160 +TARGET_VERSION_3=170 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/tests/integration-test-suite-test debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-default-bin.diff` for F in $LIST; do diff --git a/debian/rules b/debian/rules index de83f2d5..c68935e9 100755 --- a/debian/rules +++ b/debian/rules @@ -811,6 +811,10 @@ ifndef LLVM_SPIRV endif touch $@ +# Remove some new flags introduced by dpkg 1.22.0; +STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g") +STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g") + build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: @echo "Building compiler-rt for $(cpu)" @@ -825,8 +829,8 @@ build-wasm/compiler-rt-%: -DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \ -DCMAKE_C_COMPILER=$(STAGE_2_BIN_DIR)/clang \ -DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \ - -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS)" \ + -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_WASM_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_WASM_CXXFLAGS)" \ -DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ @@ -1006,7 +1010,7 @@ endif echo "Generating manpage of $$f"; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \ done - # Create the following directory regardless as libomp-16-doc + # Create the following directory regardless as libomp-XX-doc # is Architecture: all mkdir -p openmp/runtime/doc/doxygen/generated/html/ @@ -1204,7 +1208,7 @@ endif # Disable the python binding for buster. not sure why it regressed # regressed de4364f1ecaa..0745b0c0354a - if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \ + if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \ touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \ diff --git a/debian/tests/control b/debian/tests/control index 1cff65f8..fd712f0f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -7,7 +7,7 @@ Restrictions: allow-stderr Architecture: amd64 arm64 i386 Tests: integration-test-suite-test -Depends: @, cmake, make, g++, libstdc++-10-dev +Depends: @, cmake, make, g++, libstdc++-13-dev Restrictions: allow-stderr Architecture: amd64 arm64