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

This commit is contained in:
Sylvestre Ledru 2021-07-11 23:53:33 +02:00
commit aebb2477d9
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -68,6 +68,12 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 30 Jan 2021 17:31:15 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Sat, 30 Jan 2021 17:31:15 +0100
llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium
* New upsream release
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 09 Jul 2021 09:13:12 +0200
llvm-toolchain-12 (1:12.0.1~+rc4-1) unstable; urgency=medium llvm-toolchain-12 (1:12.0.1~+rc4-1) unstable; urgency=medium
* New testing upstream release * New testing upstream release

2
debian/unpack.sh vendored
View File

@ -15,7 +15,7 @@ tar Jxf $LLVM_ARCHIVE
cd llvm-toolchain-${ORIG_VERSION}_$MAJOR_VERSION~+$VERSION/ cd llvm-toolchain-${ORIG_VERSION}_$MAJOR_VERSION~+$VERSION/
VER_FOUND=$(grep "PACKAGE_VERSION " libcxx/CMakeLists.txt|awk '{print $2}'|cut -d\) -f1) VER_FOUND=$(grep "PACKAGE_VERSION " libcxx/CMakeLists.txt|awk '{print $2}'|cut -d\) -f1)
if test "${MAJOR_VERSION}.0.0" != "$VER_FOUND" -a "${MAJOR_VERSION}.0.0git" != "$VER_FOUND"; then if test "${MAJOR_VERSION}" != "$VER_FOUND" -a "${MAJOR_VERSION}.0.0" != "$VER_FOUND" -a "${MAJOR_VERSION}.0.0git" != "$VER_FOUND"; then
echo "Mismatch of version" echo "Mismatch of version"
echo "Expected $MAJOR_VERSION / Found $VER_FOUND" echo "Expected $MAJOR_VERSION / Found $VER_FOUND"
echo "Update unpack.sh" echo "Update unpack.sh"