Merge remote-tracking branch 'origin/12' into 13

This commit is contained in:
Sylvestre Ledru 2021-08-08 11:02:11 +02:00
commit 8898d4f746
3 changed files with 9 additions and 1 deletions

7
debian/changelog vendored
View File

@ -79,6 +79,13 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 30 Jan 2021 17:31:15 +0100
llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium
* Make libunwind-dev depends on libunwind
* Don't build libunwind on armel & mipsel
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 08 Aug 2021 10:58:54 +0200
llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium
* Build libunwind only on amd64 arm64 armhf i386

1
debian/control vendored
View File

@ -738,6 +738,7 @@ Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 sparc sparc6
Multi-Arch: same
Depends:
${misc:Depends},
libunwind-12 (= ${binary:Version})
Breaks: libunwind-dev
Provides: libunwind-x.y-dev
Conflicts: libunwind-x.y-dev

2
debian/rules vendored
View File

@ -194,7 +194,7 @@ endif
# Enable libunwind (or not)
LIBUNWIND_ENABLE=yes
ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel))
LIBUNWIND_ENABLE=no
else
PROJECTS+=;libunwind