From aba0369befde0b6cfea0390f37a8036425d844c2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 25 Nov 2017 09:26:58 +0000 Subject: [PATCH 1/7] add the lp bug --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 837bb194..5721035a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium * Use ?= for some variables declarations * Remove the hardcoded declarations of llvm version in debian/rules * add /usr/lib/cuda to the CUDA toolkit search paths - Thanks to Andreas Beckmann for the patch (Closes: #882505) + Thanks to Andreas Beckmann for the patch (Closes: #882505) (LP: #1706326) -- Sylvestre Ledru Mon, 30 Oct 2017 19:41:20 +0100 From 0ee688cf909d8fc542deab5f1bd54bd70ee034d9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 25 Nov 2017 14:19:02 +0000 Subject: [PATCH 2/7] Fix the fix-scan-view-path.diff path --- debian/changelog | 1 + debian/patches/fix-scan-view-path.diff | 2 +- debian/prepare-new-release.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5721035a..1e2a8c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium * Remove the hardcoded declarations of llvm version in debian/rules * add /usr/lib/cuda to the CUDA toolkit search paths Thanks to Andreas Beckmann for the patch (Closes: #882505) (LP: #1706326) + * Fix the fix-scan-view-path.diff path -- Sylvestre Ledru Mon, 30 Oct 2017 19:41:20 +0100 diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index d9fa6c81..3f722a6d 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -6,7 +6,7 @@ Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-3.9' ++BASE_DIR = '/usr/share/clang/scan-view-5.0' def url_is_up(url): diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index d1402c35..e52e8085 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -4,7 +4,7 @@ TARGET_VERSION=5.0 ORIG_VERSION_2=4_0 TARGET_VERSION_2=5_0 -LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff` +LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff` for F in $LIST; do sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F From 11e2315cd7c0bd47106e920e3b5a223a17cc0b03 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 26 Nov 2017 22:52:46 +0000 Subject: [PATCH 3/7] Move libomp-dev from Suggests to Recommends (Closes: #882781) --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e2a8c74..e9ad681b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium * add /usr/lib/cuda to the CUDA toolkit search paths Thanks to Andreas Beckmann for the patch (Closes: #882505) (LP: #1706326) * Fix the fix-scan-view-path.diff path + * Move libomp-dev from Suggests to Recommends (Closes: #882781) -- Sylvestre Ledru Mon, 30 Oct 2017 19:41:20 +0100 diff --git a/debian/control b/debian/control index 9dcadeb5..667a797c 100644 --- a/debian/control +++ b/debian/control @@ -28,8 +28,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libclang-common-5.0-dev (= ${binary:Version}), libclang1-5.0 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-5.0-dev, python -Suggests: gnustep, gnustep-devel, clang-5.0-doc, libomp-dev +Recommends: llvm-5.0-dev, python, libomp-dev +Suggests: gnustep, gnustep-devel, clang-5.0-doc Replaces: clang-include-fixer-5.0 Breaks: clang-include-fixer-5.0 Description: C, C++ and Objective-C compiler From 0caeaf587c610f8f73694529c188fa7e4d5a0177 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 27 Nov 2017 21:32:58 +0000 Subject: [PATCH 4/7] add the missing file --- debian/clang-X.Y.install.in | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index dc145ec3..20dbf6cc 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -4,6 +4,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-cpp #usr/share/man/man1/clang.1 usr/share/man/man1/ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/clang/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ +usr/lib/llvm-@LLVM_VERSION@/share/clang/bash-autocomplete.sh usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ From cc175a806e7cb45f048ced2cd8e9dd7f28f403cf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 27 Nov 2017 22:34:20 +0000 Subject: [PATCH 5/7] changelog --- debian/changelog | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9ad681b..7ccf2e0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ -llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium +llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp2) experimental; urgency=medium - * Create clang-tools-4.0 and move the various clang tools into it - clang-tools-4.0 depends on clang-4.0. This might affect some packages. + * Create clang-tools-5.0 and move the various clang tools into it + clang-tools-5.0 depends on clang-5.0. This might affect some packages. (Closes: #836397) - * Update of the copyright file (Closes: #878502) - Thanks to Nicholas D Steeves for the work * Take a patch for a stack alignment on sparc64 for rust Thanks to John Paul Adrian Glaubitz for the work (Closes: #880221) * Update of the clang description @@ -21,6 +19,20 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium -- Sylvestre Ledru Mon, 30 Oct 2017 19:41:20 +0100 + +llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium + + * New testing release + * Update of the copyright file (Closes: #878502) + Thanks to Nicholas D Steeves for the work + * Try to fix the mipsel FTBFS (Closes: #877567) + I am trying the first option from the bug: + - gsplit-dward on 32 bits archs + - -g everywhere + Many thanks to Adrian Bunk for that + + -- Sylvestre Ledru Fri, 03 Nov 2017 15:30:19 +0100 + llvm-toolchain-4.0 (1:4.0.1-8) unstable; urgency=medium [ Ximin Luo ] From 0822fa7d0e7666839124057b8cfcb88f39eda504 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 Nov 2017 15:48:07 +0000 Subject: [PATCH 6/7] * Add a symlink to fix lldb-X.Y (Closes: #881993) * Do not ship liblld-5.0-dbg as we are not shipping the .so in this version --- debian/changelog | 10 ++++++++-- debian/control | 26 +++++++++++++------------- debian/rules | 6 +++--- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ccf2e0e..752d3536 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp3) UNRELEASED; urgency=medium + + * Add a symlink to fix lldb-X.Y (Closes: #881993) + + -- Sylvestre Ledru Wed, 29 Nov 2017 16:46:58 +0100 + llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp2) experimental; urgency=medium * Create clang-tools-5.0 and move the various clang tools into it @@ -16,9 +22,9 @@ llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp2) experimental; urgency=medium Thanks to Andreas Beckmann for the patch (Closes: #882505) (LP: #1706326) * Fix the fix-scan-view-path.diff path * Move libomp-dev from Suggests to Recommends (Closes: #882781) + * Do not ship liblld-5.0-dbg as we are not shipping the .so in this version - -- Sylvestre Ledru Mon, 30 Oct 2017 19:41:20 +0100 - + -- Sylvestre Ledru Tue, 28 Nov 2017 16:27:35 +0100 llvm-toolchain-5.0 (1:5.0.1~+rc1-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 667a797c..58d6d978 100644 --- a/debian/control +++ b/debian/control @@ -430,19 +430,19 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-5.0-dbg -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel -# ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-5.0 (= ${binary:Version}) -Pre-Depends: ${misc:Pre-Depends} -Section: debug -Priority: optional -Description: LLVM-based linker, debugging libraries - LLD is a new, high-performance linker. It is built as a set of reusable - components which highly leverage existing libraries in the larger LLVM - Project. - . - This package contains the LLD runtime library debug symbols. +# Package: liblld-5.0-dbg +# Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel +# # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed +# Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-5.0 (= ${binary:Version}) +# Pre-Depends: ${misc:Pre-Depends} +# Section: debug +# Priority: optional +# Description: LLVM-based linker, debugging libraries +# LLD is a new, high-performance linker. It is built as a set of reusable +# components which highly leverage existing libraries in the larger LLVM +# Project. +# . +# This package contains the LLD runtime library debug symbols. Package: liblld-5.0-dev diff --git a/debian/rules b/debian/rules index e17f9e0a..9681c267 100755 --- a/debian/rules +++ b/debian/rules @@ -502,9 +502,9 @@ override_dh_strip: dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=liblldb-$(LLVM_VERSION)-dbg -ifeq (${LLD_ENABLE},yes) - dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg -endif +#ifeq (${LLD_ENABLE},yes) +# dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg +#endif dh_strip -a From 3278779c2087fb59e8acf4981200f3d177d174cf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 Nov 2017 15:50:01 +0000 Subject: [PATCH 7/7] add a missing file --- debian/lldb-X.Y.links.in | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/lldb-X.Y.links.in diff --git a/debian/lldb-X.Y.links.in b/debian/lldb-X.Y.links.in new file mode 100644 index 00000000..1c56bf30 --- /dev/null +++ b/debian/lldb-X.Y.links.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server-@LLVM_VERSION_FULL@