From 9412c55f5ec0923da6952edd1947499748500197 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 Jan 2020 17:16:04 +0100 Subject: [PATCH 1/7] 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 ec59040010f484e8ac82e2b7841f3036cb9acb65 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 28 Jan 2020 23:35:27 +0100 Subject: [PATCH 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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