From a83617d1bd6cbfe113fb907a26ac078bc1994db8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 Jan 2020 17:13:47 +0100 Subject: [PATCH 01/29] prepare the llvm-toolchain-10 branch --- debian/changelog | 4 ++-- debian/control | 2 +- debian/orig-tar.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e36d33d..882e9cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -llvm-toolchain-snapshot (1:10~++20200104105135+2306f43ccb4-1~exp1) experimental; urgency=medium +llvm-toolchain-10 (1:10~++20200104105135+2306f43ccb4-1~exp1) experimental; urgency=medium + * Branch llvm-toolchain-10 into its own branch * Merge recent 9 changes (python 3 and testsuite mostly) - * experimental New snapshot release -- Sylvestre Ledru Sat, 04 Jan 2020 10:56:15 +0100 diff --git a/debian/control b/debian/control index 17b97280..1500f427 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-10 Section: devel Priority: optional Rules-Requires-Root: no diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index e386e17e..8cc6e9e4 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -118,7 +118,7 @@ if test -z "$TAG" -a -z "$FINAL_RELEASE"; then # the + is here to make sure that this version is considered more recent than the svn # dpkg --compare-versions 10~svn374977-1~exp1 lt 10~+2019-svn374977-1~exp1 # to verify that - VERSION="${VERSION}~++$(date +'%Y%m%d%I%M%S')+$(git log -1 --pretty=format:'%h')" + VERSION="${VERSION}~+$(date +'%Y%m%d%I%M%S')+$(git log -1 --pretty=format:'%h')" else if ! echo "$EXACT_VERSION"|grep -q "$MAJOR_VERSION"; then From 9412c55f5ec0923da6952edd1947499748500197 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 Jan 2020 17:16:04 +0100 Subject: [PATCH 02/29] fix the version --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 1500f427..9be2658b 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, Build-Conflicts: oprofile, ocaml Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ -Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 9 -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/9 +Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 10 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/10 # ------------- clang ------------- From cb1ae5a331a27b54dbfcaf8f6b362ea82e1b772c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 20 Jan 2020 22:11:15 +0100 Subject: [PATCH 03/29] fix the unpack.sh script --- debian/unpack.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/unpack.sh b/debian/unpack.sh index 0df33d3c..31d8dab5 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,8 +1,9 @@ set -e -ORIG_VERSION=snapshot +ORIG_VERSION=10 MAJOR_VERSION=10 # 8.0.1 -REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` +REV=`ls -1 *$ORIG_VERSION_$MAJOR_VERSION*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` +#SVN_REV=347285 VERSION=$REV #VERSION=+rc3 From 7627039c28e85140e938f0a93c775ddad5a6ff66 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 20 Jan 2020 23:14:32 +0100 Subject: [PATCH 04/29] fix version --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 882e9cfb..440214a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -llvm-toolchain-10 (1:10~++20200104105135+2306f43ccb4-1~exp1) experimental; urgency=medium +llvm-toolchain-10 (1:10~+20200120101212+de4b2a7fad6-1~exp1) UNRELEASED; urgency=medium * Branch llvm-toolchain-10 into its own branch * Merge recent 9 changes (python 3 and testsuite mostly) - -- Sylvestre Ledru Sat, 04 Jan 2020 10:56:15 +0100 + -- Sylvestre Ledru Mon, 20 Jan 2020 23:14:23 +0100 llvm-toolchain-snapshot (1:10~++20191229111838+6991d5728f1-1~exp1) experimental; urgency=medium From 9c232e43aec424a2bbb9a10ffa2dcdc1c01ca349 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 20 Jan 2020 23:15:36 +0100 Subject: [PATCH 05/29] prepare upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 440214a7..130e88d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-10 (1:10~+20200120101212+de4b2a7fad6-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-10 (1:10~+20200120101212+de4b2a7fad6-1~exp1) experimental; urgency=medium * Branch llvm-toolchain-10 into its own branch * Merge recent 9 changes (python 3 and testsuite mostly) From 37d53e8d2e3144274e712b6d3ee0544e0212cc85 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 21 Jan 2020 09:04:16 +0100 Subject: [PATCH 06/29] unbreak the upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 130e88d1..85906289 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ llvm-toolchain-10 (1:10~+20200120101212+de4b2a7fad6-1~exp1) experimental; urgenc -- Sylvestre Ledru Mon, 20 Jan 2020 23:14:23 +0100 -llvm-toolchain-snapshot (1:10~++20191229111838+6991d5728f1-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:10~+20191229111838+6991d5728f1-1~exp1) experimental; urgency=medium * experimental New snapshot release * Add a '+' in the version (as the old upload is high than the one without) From 6ebc168912485b28f0ed58764fe37ff6c05a3a04 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 21 Jan 2020 14:07:12 +0100 Subject: [PATCH 07/29] Update of the qualify-script --- debian/qualify-clang.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index d5958748..599695bb 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -9,8 +9,9 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") DETAILED_VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p") DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) -LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb" +LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" +echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*'" echo "sudo dpkg -i $LIST" L="" for f in $LIST; do From f724684a203fbff349d2ca4525be10ab67280b0e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 21 Jan 2020 14:33:05 +0100 Subject: [PATCH 08/29] add the + back in the version --- debian/changelog | 2 +- debian/orig-tar.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85906289..b6c83bff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-10 (1:10~+20200120101212+de4b2a7fad6-1~exp1) experimental; urgency=medium +llvm-toolchain-10 (1:10~++20200120101212+de4b2a7fad6-1~exp1) experimental; urgency=medium * Branch llvm-toolchain-10 into its own branch * Merge recent 9 changes (python 3 and testsuite mostly) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 8cc6e9e4..e386e17e 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -118,7 +118,7 @@ if test -z "$TAG" -a -z "$FINAL_RELEASE"; then # the + is here to make sure that this version is considered more recent than the svn # dpkg --compare-versions 10~svn374977-1~exp1 lt 10~+2019-svn374977-1~exp1 # to verify that - VERSION="${VERSION}~+$(date +'%Y%m%d%I%M%S')+$(git log -1 --pretty=format:'%h')" + VERSION="${VERSION}~++$(date +'%Y%m%d%I%M%S')+$(git log -1 --pretty=format:'%h')" else if ! echo "$EXACT_VERSION"|grep -q "$MAJOR_VERSION"; then From 23832a3a7a98a0097fd10bd95247613164f0f96f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Jan 2020 10:36:55 +0100 Subject: [PATCH 09/29] Rebase --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6c83bff..834ee18c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -llvm-toolchain-10 (1:10~++20200120101212+de4b2a7fad6-1~exp1) experimental; urgency=medium +llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) UNRELEASED; urgency=medium * Branch llvm-toolchain-10 into its own branch * Merge recent 9 changes (python 3 and testsuite mostly) - -- Sylvestre Ledru Mon, 20 Jan 2020 23:14:23 +0100 + -- Sylvestre Ledru Tue, 21 Jan 2020 14:38:02 +0100 llvm-toolchain-snapshot (1:10~+20191229111838+6991d5728f1-1~exp1) experimental; urgency=medium From 14451e5ee0638e04aeb04112fa3db770f79b17db Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Jan 2020 14:37:48 +0100 Subject: [PATCH 10/29] prepare upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 834ee18c..5dae69c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) experimental; urgency=medium * Branch llvm-toolchain-10 into its own branch * Merge recent 9 changes (python 3 and testsuite mostly) From eda53aa58951cda4e9d8bb147af9082736e261b4 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 23 Jan 2020 10:46:52 +0100 Subject: [PATCH 11/29] Drop transitional packages that never existed on 10 branch --- debian/control | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/debian/control b/debian/control index 52d94b83..d03bfa9d 100644 --- a/debian/control +++ b/debian/control @@ -166,13 +166,6 @@ Description: Clang library - Common development package This package contains the Clang generic headers and some libraries (profiling, etc). -Package: libclang-cpp1-10 -Depends: libclang-cpp10, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - Package: libclang-cpp10 Section: libs Architecture: any @@ -236,14 +229,6 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. -Package: python-clang-10 -Depends: python3-clang-10, ${misc:Depends} -Architecture: any -Priority: optional -Section: oldlibs -Description: transitional package to python3-clang-10 - This is a transitional package. It can safely be removed. - Package: clang-10-examples Architecture: any From 18945a241fe7af79fccfd266125f59325fca8c7f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 23 Jan 2020 10:56:07 +0100 Subject: [PATCH 12/29] Fix m68k architecture --- debian/control | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index d03bfa9d..96e5265b 100644 --- a/debian/control +++ b/debian/control @@ -415,7 +415,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-10 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m610k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -425,7 +425,7 @@ Description: LLVM-based linker Project. Package: liblld-10 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m610k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -439,7 +439,7 @@ Description: LLVM-based linker, library Package: liblld-10-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m610k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-10 (= ${binary:Version}), liblld-10 (= ${binary:Version}) @@ -455,7 +455,7 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-10 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m610k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version}), llvm-10-dev, python3-lldb-10 @@ -466,7 +466,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: liblldb-10 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m610k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -480,7 +480,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-10 Section: python -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m610k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-six Conflicts: python3-lldb-x.y @@ -496,7 +496,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-10-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m610k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-10 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} From 10b891972078e5137b2fa8c77b73a6bc83ac6674 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 23 Jan 2020 11:19:49 +0100 Subject: [PATCH 13/29] Add Myself to uploaders --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 96e5265b..63c52ab4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Rules-Requires-Root: no Maintainer: LLVM Packaging Team -Uploaders: Sylvestre Ledru +Uploaders: Sylvestre Ledru , Gianfranco Costamagna Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, From 89a2954b4ff4139234d9568bdbf4f5822c0862cb Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 23 Jan 2020 14:55:01 +0100 Subject: [PATCH 14/29] Cherry-pick fixes from 9 branch --- debian/control | 2 +- debian/rules | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 63c52ab4..45a8476d 100644 --- a/debian/control +++ b/debian/control @@ -482,7 +482,7 @@ Package: python3-lldb-10 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-10 (= ${binary:Version}), python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y diff --git a/debian/rules b/debian/rules index 2b0725ed..b3ff0677 100755 --- a/debian/rules +++ b/debian/rules @@ -596,10 +596,6 @@ endif # Path changed. Make a copy of it cp $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/README.txt $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/share/README.txt -# idem for the lldb python binding - mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/ - mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3.*/site-packages/* $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/ - # Remove things that CMake install but which aren't packaged yet, # or are packaged from the source or build tree. mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \ From 7dfd93565ecfaa3e3c9da34e1b9acd55bfced8c0 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 23 Jan 2020 16:34:35 +0100 Subject: [PATCH 15/29] Fix changelog with the version that went in experimental --- debian/changelog | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39056757..661d97b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,4 @@ -llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) experimental; urgency=medium - - * Branch llvm-toolchain-10 into its own branch - * Merge recent 9 changes (python 3 and testsuite mostly) +llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp2) UNRELEASED; urgency=medium [ Gianfranco Costamagna ] * fix lldb-10 -P path print (Closes: #945445) @@ -9,7 +6,14 @@ llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) experimental; urgen * Drop version constraint from libffi-dev library, satisfied since old-old-stable - -- Sylvestre Ledru Mon, 20 Jan 2020 23:14:23 +0100 + -- Gianfranco Costamagna Thu, 23 Jan 2020 16:34:23 +0100 + +llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) experimental; urgency=medium + + * Branch llvm-toolchain-10 into its own branch + * Merge recent 9 changes (python 3 and testsuite mostly) + + -- Sylvestre Ledru Tue, 21 Jan 2020 14:38:02 +0100 llvm-toolchain-snapshot (1:10~+20191229111838+6991d5728f1-1~exp1) experimental; urgency=medium From 8720d17957bcbca158421b1c9aefee8095724eec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 3 Feb 2020 11:46:47 +0100 Subject: [PATCH 16/29] First RC release --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 661d97b3..a21f3c1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium [ Gianfranco Costamagna ] * fix lldb-10 -P path print (Closes: #945445) @@ -6,7 +6,10 @@ llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp2) UNRELEASED; urgency * Drop version constraint from libffi-dev library, satisfied since old-old-stable - -- Gianfranco Costamagna Thu, 23 Jan 2020 16:34:23 +0100 + [ Sylvestre Ledru ] + * First RC release + + -- Sylvestre Ledru Mon, 03 Feb 2020 10:30:50 +0100 llvm-toolchain-10 (1:10~++20200121023453+de4b2a7fad6-1~exp1) experimental; urgency=medium From 52633865a06f3b5f36e9c4ff7cdf146e72eb4426 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Feb 2020 10:21:27 +0100 Subject: [PATCH 17/29] fix a typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a21f3c1f..b1cf9eb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -331,7 +331,7 @@ llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium Disable fuzzer only for i386 * Use stage2 files to build the doc. For some reasons, clang-tools-extra html generation stopped working - * Disable z3 when the version is tool old + * Disable z3 when the version is too old -- Sylvestre Ledru Thu, 31 Oct 2019 00:29:09 +0100 From c866dd8a6e49f0d3c600b9a2d03945531f4f73ea Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Feb 2020 23:25:55 +0100 Subject: [PATCH 18/29] do not hardcode gcc 8 anymore --- debian/control | 1 - debian/rules | 9 --------- 2 files changed, 10 deletions(-) diff --git a/debian/control b/debian/control index 45a8476d..2b127c0a 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7 Build-Conflicts: oprofile, ocaml Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ diff --git a/debian/rules b/debian/rules index b3ff0677..bad4730a 100755 --- a/debian/rules +++ b/debian/rules @@ -75,15 +75,6 @@ ifneq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) endif endif -FORCE_NOT_GCC_9_DISTRO := eoan focal bullseye sid -ifneq (,$(filter $(DISTRO),$(FORCE_NOT_GCC_9_DISTRO))) -# Force gcc before 9 (gcc 8 on Debian unstable) because it causes -# huge increase of the size of the .deb (because of .a and .so) and issues in the libs - GCC_VERSION := 8 -endif - - - export CC=gcc-$(GCC_VERSION) export CXX=g++-$(GCC_VERSION) From 44aa60f62103afc1cb282e13791a48e7238259c5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Feb 2020 23:26:09 +0100 Subject: [PATCH 19/29] disable the thinlto build --- debian/changelog | 6 ++++++ debian/rules | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b1cf9eb9..513eb1e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,12 @@ llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * First RC release + * For now, disable ThinLTO usage because: + - LLVM_ENABLE_LTO doesn't work with gcc >= 9 (option not accepted) + - BOOTSTRAP_LLVM_ENABLE_LTO is producing some large binary + (uses llvm ir instead of binary code) + See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943623 + * Thanks to this previous change, don't hardcode gcc 8 -- Sylvestre Ledru Mon, 03 Feb 2020 10:30:50 +0100 diff --git a/debian/rules b/debian/rules index bad4730a..0be82d06 100755 --- a/debian/rules +++ b/debian/rules @@ -235,7 +235,13 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) # armhf is not yet quite ready for Thin, it FTBFS # see https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-8&arch=armhf&ver=1%3A8.0.1%7E%2Brc2-1%7Eexp1&stamp=1560334266&raw=0 ifeq (,$(filter $(DEB_HOST_ARCH), armhf)) - CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin" +# Use BOOTSTRAP_LLVM_ENABLE_LTO to make sure that it isn't used +# when running stage1 with gcc +# For now, disable ThinLTO usage because: +# * LLVM_ENABLE_LTO doesn't work with gcc >= 9 (option not accepted) +# * BOOTSTRAP_LLVM_ENABLE_LTO is producing some large binary +# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943623 +# CMAKE_EXTRA += -DBOOTSTRAP_LLVM_ENABLE_LTO="Thin" endif endif endif From b53eb4b9c59f581298a30e63fb8486df835a9613 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 5 Feb 2020 10:52:26 +0100 Subject: [PATCH 20/29] update the doc by replacing 9 => 10 --- debian/README | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/README b/debian/README index 9065b72a..7e86a204 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 8 9 snapshot; do +for f in 8 9 10 snapshot; do git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f done @@ -57,7 +57,7 @@ branch at https://github.com/llvm/llvm-project/branches you should use, - $ sh 9/debian/orig-tar.sh release/9.x + $ sh 10/debian/orig-tar.sh release/10.x To retrieve a specific release candidate, you can pass the branch name as the first argument, and the tag rc number as the second argument. For example, to @@ -65,11 +65,11 @@ get the 9.0.1 release candidate rc3 at https://github.com/llvm/llvm-project/tags you should use, - $ sh 9/debian/orig-tar.sh 9.0.1 rc3 + $ sh 10/debian/orig-tar.sh 10.0.1 rc3 For a stable release, the syntax is: - $ sh 9/debian/orig-tar.sh 9.0.0 + $ sh 10/debian/orig-tar.sh 10.0.0 Additional maintainer scripts From e80c4824ce41509c54c67ff55d266adb84c3caa3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 5 Feb 2020 11:04:50 +0100 Subject: [PATCH 21/29] rebase of the patch --- .../patches/libcxx/libcxxabi-arm-ehabi-fix.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index 680e8127..55d2b588 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -7,10 +7,10 @@ sure their ABI stays in sync. No known upstream bug about this. -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxxabi/src/cxa_exception.cpp +Index: llvm-toolchain-10_10~++20200205105438+211aa5bf59e/libcxxabi/src/cxa_exception.cpp =================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/libcxxabi/src/cxa_exception.cpp -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxxabi/src/cxa_exception.cpp +--- llvm-toolchain-10_10~++20200205105438+211aa5bf59e.orig/libcxxabi/src/cxa_exception.cpp ++++ llvm-toolchain-10_10~++20200205105438+211aa5bf59e/libcxxabi/src/cxa_exception.cpp @@ -275,15 +275,16 @@ __cxa_throw(void *thrown_object, std::ty #ifdef __USING_SJLJ_EXCEPTIONS__ @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxxabi/src/cxa_ #endif // Some sort of unwinding error. Note that terminate is a handler. __cxa_begin_catch(&dep_exception_header->unwindHeader); -Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxxabi/src/cxa_exception.h +Index: llvm-toolchain-10_10~++20200205105438+211aa5bf59e/libcxxabi/src/cxa_exception.h =================================================================== ---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/libcxxabi/src/cxa_exception.h -+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxxabi/src/cxa_exception.h +--- llvm-toolchain-10_10~++20200205105438+211aa5bf59e.orig/libcxxabi/src/cxa_exception.h ++++ llvm-toolchain-10_10~++20200205105438+211aa5bf59e/libcxxabi/src/cxa_exception.h @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); @@ -114,5 +114,5 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/libcxxabi/src/cxa_ +#endif + struct _LIBCXXABI_HIDDEN __cxa_exception { - #if defined(__LP64__) || defined(_LIBCXXABI_ARM_EHABI) - // This is a new field to support C++ 0x exception_ptr. + #if defined(__LP64__) || defined(_WIN64) || defined(_LIBCXXABI_ARM_EHABI) + // Now _Unwind_Exception is marked with __attribute__((aligned)), From 0964b15d85a723057a492668f8e56b988953bc8d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Feb 2020 10:37:46 +0100 Subject: [PATCH 22/29] Do not try to install hwasan_symbolize on armhf ppc64el as it isn't built --- debian/changelog | 7 +++++++ debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 513eb1e3..5508c285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium + + * Do not try to install hwasan_symbolize on armhf ppc64el + as it isn't built + + -- Sylvestre Ledru Thu, 06 Feb 2020 10:37:39 +0100 + llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium [ Gianfranco Costamagna ] diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 7a3c02d1..04f644f1 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -31,7 +31,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize +[!armhf !ppc64el] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ From ec59040010f484e8ac82e2b7841f3036cb9acb65 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 28 Jan 2020 23:35:27 +0100 Subject: [PATCH 23/29] hurd/hurd-cxx-paths.diff: Fix patch so it can be applied --- debian/changelog | 4 ++++ debian/patches/hurd/hurd-cxx-paths.diff | 10 +++++----- debian/patches/series | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5508c285..d1b315ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium + [ Sylvestre Ledru ] * Do not try to install hwasan_symbolize on armhf ppc64el as it isn't built + [ Samuel Thibault ] + * hurd/hurd-cxx-paths.diff: Fix patch so it can be applied. + -- Sylvestre Ledru Thu, 06 Feb 2020 10:37:39 +0100 llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium diff --git a/debian/patches/hurd/hurd-cxx-paths.diff b/debian/patches/hurd/hurd-cxx-paths.diff index 5ba40531..29971310 100644 --- a/debian/patches/hurd/hurd-cxx-paths.diff +++ b/debian/patches/hurd/hurd-cxx-paths.diff @@ -6,7 +6,7 @@ Index: llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp =================================================================== --- llvm-toolchain-9-9.0.0.orig/clang/lib/Driver/ToolChains/Hurd.cpp +++ llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp -@@ -61,17 +61,107 @@ static StringRef getOSLibDir(const llvm: +@@ -61,21 +61,107 @@ static StringRef getOSLibDir(const llvm: return Triple.isArch32Bit() ? "lib" : "lib64"; } @@ -42,10 +42,6 @@ Index: llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp + .str()); + } + -+#ifdef ENABLE_LINKER_BUILD_ID -+ ExtraOpts.push_back("--build-id"); -+#endif -+ + // The selection of paths to try here is designed to match the patterns which + // the GCC driver itself uses, as this is part of the GCC-compatible driver. + // This was determined by running GCC in a fake filesystem, creating all @@ -56,6 +52,10 @@ Index: llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp const std::string OSLibDir = getOSLibDir(Triple, Args); const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot); + #ifdef ENABLE_LINKER_BUILD_ID + ExtraOpts.push_back("--build-id"); + #endif + - // If we are currently running Clang inside of the requested system root, add - // its parent library paths to those searched. + // Add the multilib suffixed paths where they are available. diff --git a/debian/patches/series b/debian/patches/series index ecd5730a..1fd7b7a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -97,6 +97,7 @@ remove-apple-clang-manpage.diff 0049-Use-Debian-provided-MathJax-everywhere.patch # Hurd port +hurd/hurd-cxx-paths.diff hurd/hurd-pathmax.diff # powerpcspe From f968f6db8aa9760d859f7bde3162d67dc9b97bef Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 30 Jan 2020 09:28:55 +0100 Subject: [PATCH 24/29] clang-tools-X.Y.install.in: Do not try to install hwasan_symbolize on hurd-any --- debian/changelog | 2 ++ debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d1b315ed..680764e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium [ Samuel Thibault ] * hurd/hurd-cxx-paths.diff: Fix patch so it can be applied. + * clang-tools-X.Y.install.in: Do not try to install hwasan_symbolize on + hurd-any. -- Sylvestre Ledru Thu, 06 Feb 2020 10:37:39 +0100 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 04f644f1..cfe2bd15 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -31,7 +31,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper -[!armhf !ppc64el] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize +[!armhf !ppc64el !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ From 46534b6a8988cdf74b84a3cd5da092d497b2bcca Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 7 Feb 2020 14:10:55 +0100 Subject: [PATCH 25/29] also make clang-tools-X.Y.install.in +x for dh-exec --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 0be82d06..2c345fd1 100755 --- a/debian/rules +++ b/debian/rules @@ -296,7 +296,7 @@ preconfigure: done # Make install file executable for dh-exec - chmod +x debian/llvm-$(LLVM_VERSION)-dev.install + chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install.in # DH doesn't support the [power ...] in install on Ubuntu trusty # fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory From fa3f68f24af2dd4ecb99f53399bf2936ed188606 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 7 Feb 2020 14:57:41 +0100 Subject: [PATCH 26/29] remove the .in --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2c345fd1..2069f305 100755 --- a/debian/rules +++ b/debian/rules @@ -296,7 +296,7 @@ preconfigure: done # Make install file executable for dh-exec - chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install.in + chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install # DH doesn't support the [power ...] in install on Ubuntu trusty # fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory From 04a779c409316dc3760ab661d16d91743327c474 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Feb 2020 17:52:29 +0100 Subject: [PATCH 27/29] add bug number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 680764e3..0a7439e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium [ Sylvestre Ledru ] * Do not try to install hwasan_symbolize on armhf ppc64el - as it isn't built + as it isn't built (Closes: #950899) [ Samuel Thibault ] * hurd/hurd-cxx-paths.diff: Fix patch so it can be applied. From d661cfad84e80b6c56699fdbaa102c111bd23966 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Feb 2020 19:07:50 +0100 Subject: [PATCH 28/29] add missing #/usr/bin/dh-exec --- debian/clang-tools-X.Y.install.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index cfe2bd15..823e3733 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -1,3 +1,5 @@ +#!/usr/bin/dh-exec + usr/lib/llvm-@LLVM_VERSION@/bin/clang-check usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements usr/lib/llvm-@LLVM_VERSION@/bin/clang-query From 63c644639be42e8118566b7742595c44278f45f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 14 Feb 2020 09:48:16 +0100 Subject: [PATCH 29/29] * Second RC release - Should fix the s390x issue (reported upstream) (Closes: #950900) (Closes: #950899) --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5508c285..a6536033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium +llvm-toolchain-10 (1:10.0.0~+rc2-1~exp1) experimental; urgency=medium + * Second RC release + - Should fix the s390x issue (reported upstream) + (Closes: #950900) * Do not try to install hwasan_symbolize on armhf ppc64el as it isn't built + (Closes: #950899) - -- Sylvestre Ledru Thu, 06 Feb 2020 10:37:39 +0100 + -- Sylvestre Ledru Fri, 14 Feb 2020 09:46:43 +0100 llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium