From ef75620dfafabad4dcf379d75ac39ce15741747e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 3 Sep 2021 09:04:33 +0200 Subject: [PATCH] * Ship clang-nvlink-wrapper as part of clang-tools-XX See https://reviews.llvm.org/D108291 --- debian/changelog | 4 +++- debian/clang-tools-X.Y.install.in | 2 ++ debian/clang-tools-X.Y.manpages.in | 2 +- debian/rules | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f7cc739..2391fec0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ llvm-toolchain-snapshot (1:14~++20210827020436+15b2a8e7faf6-1~exp2) UNRELEASED; * Disable libunwind-X.Y{-dev} packages on sparc and sparc64 [ Sylvestre Ledru ] - * Ship clang-repl + * Ship clang-repl as part of clang-tools-XX See https://reviews.llvm.org/D106813 + * Ship clang-nvlink-wrapper as part of clang-tools-XX + See https://reviews.llvm.org/D108291 -- Sylvestre Ledru Tue, 31 Aug 2021 22:17:35 +0200 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index f023a3cd..93f88ce5 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -32,6 +32,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@/bin/clang-repl +usr/lib/llvm-@LLVM_VERSION@/bin/clang-nvlink-wrapper usr/lib/llvm-@LLVM_VERSION@/bin/analyze-build usr/lib/llvm-@LLVM_VERSION@/bin/intercept-build @@ -92,3 +93,4 @@ usr/bin/clang-move-@LLVM_VERSION@ usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/clang-offload-wrapper-@LLVM_VERSION@ usr/bin/clang-repl-@LLVM_VERSION@ +usr/bin/clang-nvlink-wrapper-@LLVM_VERSION@ \ No newline at end of file diff --git a/debian/clang-tools-X.Y.manpages.in b/debian/clang-tools-X.Y.manpages.in index 3b882bb8..b8d15e29 100644 --- a/debian/clang-tools-X.Y.manpages.in +++ b/debian/clang-tools-X.Y.manpages.in @@ -10,4 +10,4 @@ debian/man/find-all-symbols-@LLVM_VERSION@.1 debian/man/clang-include-fixer-@LLVM_VERSION@.1 debian/man/clang-reorder-fields-@LLVM_VERSION@.1 debian/man/clang-repl-@LLVM_VERSION@.1 - +debian/man/clang-nvlink-wrapper-@LLVM_VERSION@.1 \ No newline at end of file diff --git a/debian/rules b/debian/rules index 312da4eb..c064fab7 100755 --- a/debian/rules +++ b/debian/rules @@ -610,7 +610,7 @@ endif help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 || true help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 || true - CMDS="llvm-dwarfdump llvm-mc llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb clang-format clang-repl clang clang++ clang-tblgen clang-check clang-cpp clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen clang-change-namespace clang-offload-bundler clangd"; \ + CMDS="llvm-dwarfdump llvm-mc llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb clang-format clang-repl clang clang++ clang-tblgen clang-check clang-cpp clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields ld.lld llvm-tblgen clang-change-namespace clang-offload-bundler clangd clang-nvlink-wrapper"; \ for f in $$CMDS; do \ echo "Generating manpage of $$f"; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \