From c3ab7d5284c8ed520411896b70a0717509172ed4 Mon Sep 17 00:00:00 2001 From: kasperk81 Date: Wed, 16 Jun 2021 12:26:08 -0400 Subject: [PATCH 01/10] Add riscv64 architecture in control --- debian/control | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 5a0e35fd..0bd8d437 100644 --- a/debian/control +++ b/debian/control @@ -387,7 +387,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-12-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf ppc64el s390x riscv64 Suggests: llvm-12-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-12-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev @@ -451,7 +451,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-12 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -461,7 +461,7 @@ Description: LLVM-based linker Project. Package: liblld-12 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -475,7 +475,7 @@ Description: LLVM-based linker, library Package: liblld-12-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-12 (= ${binary:Version}), liblld-12 (= ${binary:Version}) @@ -491,7 +491,7 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-12 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}), llvm-12-dev, python3-lldb-12 @@ -502,7 +502,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: liblldb-12 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -516,7 +516,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-12 Section: python -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-12 (= ${binary:Version}), python3-six Conflicts: python3-lldb-x.y @@ -532,7 +532,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-12-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -550,7 +550,7 @@ Description: Next generation, high-performance debugger, header files Package: libomp-12-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 +Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: libomp5-12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-12-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) @@ -564,7 +564,7 @@ Description: LLVM OpenMP runtime - dev package Package: libomp5-12 Multi-Arch: same -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 +Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libomp5 (<< 44) Provides: libomp-x.y @@ -577,7 +577,7 @@ Description: LLVM OpenMP runtime Package: libomp-12-doc Section: doc -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 +Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery Replaces: libiomp-x.y-doc Breaks: libiomp-x.y-doc From 3c340db4241842371bc0c7ca727b2cdb7c1cdec1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Jul 2021 23:51:57 +0200 Subject: [PATCH 02/10] remove comment which breaks the build --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a2f9e619..ecd71eb6 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, lsb-release, patchutils, diffstat, xz-utils, python3-dev, libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), binutils-dev, - libxml2-dev, # for llvm-mt + libxml2-dev, libjsoncpp-dev, pkg-config, lcov, procps, help2man, zlib1g-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], From 2b662cc078d747db5b04d8b91354e852801aee19 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Jul 2021 23:53:51 +0200 Subject: [PATCH 03/10] remove comment which breaks the build --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 292fb788..a05359bc 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, lsb-release, patchutils, diffstat, xz-utils, python3-dev, libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), binutils-dev, - libxml2-dev, # for llvm-mt + libxml2-dev, libjsoncpp-dev, pkg-config, lcov, procps, help2man, zlib1g-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], From 43a0ec5e224038b1ece5ad530c888f07ff7ae955 Mon Sep 17 00:00:00 2001 From: Kasper Kantz Date: Sun, 11 Jul 2021 23:02:15 +0000 Subject: [PATCH 04/10] Update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index db46b709..f6c0b37e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-12 (1:12.0.1~+rc1-1) unstable; urgency=medium + + [ Kasper Kantz ] + * Add riscv64 architecture in control + enable liblldb, libomp and others which are + currently unavailable in riscv64 repository. + llvm-toolchain-12 (1:12.0.1~+rc1-1) unstable; urgency=medium [ John Paul Adrian Glaubitz ] From 10498aebad5c2403a434be5ba9cee7d71185aaa2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 13 Jul 2021 09:44:49 +0200 Subject: [PATCH 05/10] fix changelog --- debian/changelog | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6a6c935..5c806288 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium + + [ Kasper Kantz ] + * Add riscv64 architecture in control + enable liblldb, libomp and others which are + currently unavailable in riscv64 repository. + + -- Sylvestre Ledru Tue, 13 Jul 2021 09:44:27 +0200 + llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium * New upsream release @@ -24,13 +33,6 @@ llvm-toolchain-12 (1:12.0.1~+rc2-1) unstable; urgency=medium -- Sylvestre Ledru Mon, 21 Jun 2021 16:06:36 +0200 -llvm-toolchain-12 (1:12.0.1~+rc1-1) unstable; urgency=medium - - [ Kasper Kantz ] - * Add riscv64 architecture in control - enable liblldb, libomp and others which are - currently unavailable in riscv64 repository. - llvm-toolchain-12 (1:12.0.1~+rc1-1) unstable; urgency=medium [ John Paul Adrian Glaubitz ] From ed64f98bf820d8532b3abc698ebe5de45903eebb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 16 Jul 2021 08:58:50 +0200 Subject: [PATCH 06/10] fix dep --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 424048d9..93d3cc6f 100644 --- a/debian/control +++ b/debian/control @@ -349,8 +349,8 @@ Package: llvm-12-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, llvm-12 (= ${binary:Version}), libllvm12 (= ${binary:Version}), libtinfo-dev, - llvm-12-tools (= ${binary:Version}), libclang-cpp12 (= ${binary:Version}), libz3-dev - libxml2-dev + llvm-12-tools (= ${binary:Version}), libclang-cpp12 (= ${binary:Version}), + libz3-dev, libxml2-dev Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other From 7968be8f04700900a1ddd500b0351dc755e0f3d6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 17 Jul 2021 20:14:53 +0200 Subject: [PATCH 07/10] * Fix the default binary path for scan-build-py to clang-11 (instead of clang) - see scan-build-py-fix-default-bin.diff tested by https://github.com/opencollab/llvm-toolchain-integration-test-suite/ - not really working for now --- debian/changelog | 8 +++++++- debian/patches/scan-build-py-fix-default-bin.diff | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 debian/patches/scan-build-py-fix-default-bin.diff diff --git a/debian/changelog b/debian/changelog index 06aed14c..582edac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ llvm-toolchain-11 (1:11.1.0-1~exp2) experimental; urgency=medium + * Fix the default binary path for scan-build-py to clang-11 (instead of + clang) - see scan-build-py-fix-default-bin.diff + tested by + https://github.com/opencollab/llvm-toolchain-integration-test-suite/ + [ Krzysztof Aleksander Pyrkosz ] * Add libxml2 as a dependency as it is necessary for llvm manifest tool (llvm-mt) (Closes: #990537) + - not really working for now - -- Sylvestre Ledru Sun, 11 Jul 2021 23:32:10 +0200 + -- Sylvestre Ledru Sat, 17 Jul 2021 20:13:57 +0200 llvm-toolchain-11 (1:11.1.0-1~exp1) experimental; urgency=medium diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff new file mode 100644 index 00000000..681a44a6 --- /dev/null +++ b/debian/patches/scan-build-py-fix-default-bin.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments.py +=================================================================== +--- llvm-toolchain-12-12.0.0.orig/clang/tools/scan-build-py/libscanbuild/arguments.py ++++ llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments.py +@@ -250,7 +250,7 @@ def create_analyze_parser(from_build_com + '--use-analyzer', + metavar='', + dest='clang', +- default='clang', ++ default='clang-11', + help="""'%(prog)s' uses the 'clang' executable relative to itself for + static analysis. One can override this behavior with this option by + using the 'clang' packaged with Xcode (on OS X) or from the PATH.""") diff --git a/debian/patches/series b/debian/patches/series index c89297d0..09fd4ef0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -144,3 +144,4 @@ silent-integration-test-suite-i386.diff revert-abi-change-clang.diff scan-build-py-fix-analyze-path.diff D91833-bpftrace-fix-code-gen.diff +scan-build-py-fix-default-bin.diff From 828b18e02fd4a407a6660cbfd8942935895f55a4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 17 Jul 2021 20:15:52 +0200 Subject: [PATCH 08/10] Fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5c806288..d568de0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium enable liblldb, libomp and others which are currently unavailable in riscv64 repository. - -- Sylvestre Ledru Tue, 13 Jul 2021 09:44:27 +0200 + -- Sylvestre Ledru Mon, 12 Jul 2021 08:19:59 +0200 llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium From bee0e9fdfb07798752413785f64446fa55ec8258 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 12 Jul 2021 08:21:00 +0200 Subject: [PATCH 09/10] also mention a change from -11 --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index d568de0e..5e57791b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium enable liblldb, libomp and others which are currently unavailable in riscv64 repository. + [ Krzysztof Aleksander Pyrkosz ] + * Add libxml2 as a dependency as it is necessary + for llvm manifest tool (llvm-mt) + (Closes: #990537) + -- Sylvestre Ledru Mon, 12 Jul 2021 08:19:59 +0200 llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium From 50d9eaeca8d4294fec971d3afb8f219ceb5f5fd2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 17 Jul 2021 20:16:39 +0200 Subject: [PATCH 10/10] adjust the scan-build-py path --- debian/patches/scan-build-py-fix-default-bin.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff index 681a44a6..960773ca 100644 --- a/debian/patches/scan-build-py-fix-default-bin.diff +++ b/debian/patches/scan-build-py-fix-default-bin.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments metavar='', dest='clang', - default='clang', -+ default='clang-11', ++ default='clang-12', help="""'%(prog)s' uses the 'clang' executable relative to itself for static analysis. One can override this behavior with this option by using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")