Merge commit '9f25141' into 11

This commit is contained in:
Sylvestre Ledru 2021-01-06 09:25:29 +01:00
commit bded0f07db
4 changed files with 18 additions and 3 deletions

16
debian/changelog vendored
View File

@ -1,6 +1,22 @@
llvm-toolchain-11 (1:11.0.1-1) unstable; urgency=medium
[ Sylvestre Ledru ]
* New stable release
[ Gianfranco Costamagna ]
* Drop old patch, upstream now
* Run dh_makeshlibs with -V parameter (Closes: #977814)
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 06 Jan 2021 09:21:24 +0100
llvm-toolchain-11 (1:11.0.1~+rc2-1) unstable; urgency=medium
<<<<<<<
* New snapshot release
=======
* New snapshot release
* Remove 'gnu-assembler-compat.diff' - merged upstream
>>>>>>>
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 19 Dec 2020 09:38:48 +0100

View File

@ -132,7 +132,6 @@ workaround-bug-42994-use-linker.diff
# bug 939472
#try-to-unbreak-thinlto.diff
D67877.patch
x86-fuzzer.patch

2
debian/rules vendored
View File

@ -724,7 +724,7 @@ override_dh_makeshlibs:
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:9~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:9~svn298832-1~)"
dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:9~svn298832-1~)"
dh_makeshlibs --remaining-packages
dh_makeshlibs --remaining-packages -V
override_dh_shlibdeps:
# Ignore asan libraries. They would trigger dependencies to multiarch libraries

2
debian/unpack.sh vendored
View File

@ -1,6 +1,6 @@
set -e
ORIG_VERSION=11
MAJOR_VERSION=11 # 8.0.1
MAJOR_VERSION=11.0.1 # 8.0.1
REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru`
VERSION=$REV