Merge branch '16' into snapshot

This commit is contained in:
Gianfranco Costamagna 2023-03-21 10:20:24 +01:00
commit 2f59b80043
5 changed files with 44 additions and 7 deletions

36
debian/changelog vendored
View File

@ -21,6 +21,25 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 28 Jan 2023 18:07:40 +0100
llvm-toolchain-16 (1:16.0.0-1~exp2) experimental; urgency=medium
[ Matthias Klose <doko@ubuntu.com> ]
* Install liborc_rt-armhf.a on armhf.
* Don't ship gdb scripts for ompd on armhf.
* Don't run MLIR tests on armhf, timeouts on the buildds.
[ Gianfranco Costamagna ]
* Try to use gold linker on riscv64, to see if the build goes to
the end successfully
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 21 Mar 2023 09:41:39 +0100
llvm-toolchain-16 (1:16.0.0-1~exp1) experimental; urgency=medium
* New upstream release
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 18 Mar 2023 21:41:44 +0100
llvm-toolchain-16 (1:16.0.0~+rc4-1~exp1) experimental; urgency=medium
* New snapshot release
@ -122,6 +141,7 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental
llvm-toolchain-15 (1:15.0.7-4) UNRELEASED; urgency=medium
* Fix debian/libclang1-15.symbols soname
* Remove build artifacts if any
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 15 Mar 2023 21:45:46 +0100
@ -167,6 +187,12 @@ llvm-toolchain-15 (1:15.0.7-2) unstable; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 15 Jan 2023 10:54:41 +0100
llvm-toolchain-15 (1:15.0.7-1~exp1) UNRELEASED; urgency=medium
* experimental New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 13 Jan 2023 15:12:11 +0100
llvm-toolchain-15 (1:15.0.7-1) unstable; urgency=medium
* New upstream release
@ -188,6 +214,12 @@ llvm-toolchain-15 (1:15.0.6-5~exp2) experimental; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Jan 2023 13:19:48 +0100
llvm-toolchain-15 (1:15.0.6~++20230102020141+088f33605d8a-1~exp1) UNRELEASED; urgency=medium
* experimental New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 02 Jan 2023 14:01:53 +0100
llvm-toolchain-15 (1:15.0.6-5~exp1) experimental; urgency=medium
* Add flang-15 and libraries support
@ -272,8 +304,10 @@ llvm-toolchain-15 (1:15.0.5-1) unstable; urgency=medium
* New upstream release
* Remove the swig patches (applied upstream)
* experimental New snapshot release
* experimental New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 16 Nov 2022 09:11:01 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 16 Nov 2022 09:02:30 +0100
llvm-toolchain-15 (1:15.0.4-1) unstable; urgency=medium

View File

@ -6,5 +6,5 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/*clang_rt*
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h
# See cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
[amd64 arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
# See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
[amd64 armhf arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*

View File

@ -19,4 +19,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
[!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/

2
debian/orig-tar.sh vendored
View File

@ -155,7 +155,7 @@ else
fi
# cleanup
rm -rf */www/
rm -rf */www/ build/ build-llvm/
cd ../
BASE="llvm-toolchain-${MAJOR_VERSION}_${VERSION}"

7
debian/rules vendored
View File

@ -278,7 +278,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
endif
BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el riscv64 x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold
@ -585,6 +585,9 @@ override_dh_auto_configure: preconfigure
$(CC) -v
$(CXX) -v
mkdir -p $(TARGET_BUILD)
# remove in case of artifact
rm -rf build
if test "$(SCAN_BUILD)" = "yes"; then \
patch -f -p1 < debian/patches/on-the-fly/use-scan-build-runtimes.diff||true; \
fi
@ -1324,7 +1327,7 @@ endif
ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true
# MLIR
ifeq (,$(filter $(DEB_HOST_ARCH), i386 x32))
ifeq (,$(filter $(DEB_HOST_ARCH), armhf i386 x32))
# Do not run MLIR test on i386 because of
# https://github.com/llvm/llvm-project/issues/58357
ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-mlir || true