From 446e6cf9bed6f082a3fdb5a966481a697e941b57 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 31 Jul 2019 22:37:51 +0200 Subject: [PATCH 1/8] Ship clangd-8 as a new package (Closes: #932432) --- debian/changelog | 1 + debian/clang-tools-X.Y.install.in | 2 -- debian/clangd-X.Y.install.in | 3 +++ debian/clangd-X.Y.manpages.in | 1 + debian/control | 18 ++++++++++++++++-- debian/rules | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 debian/clangd-X.Y.install.in create mode 100644 debian/clangd-X.Y.manpages.in diff --git a/debian/changelog b/debian/changelog index 3861c675..ff452f28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium * New stable release * Ship python3-lldb-8 as a new package + * Ship clangd-8 as a new package (Closes: #932432) -- Sylvestre Ledru Sat, 27 Jul 2019 23:50:48 +0200 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index a06d334b..e1480030 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -21,7 +21,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/modularize usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test usr/lib/llvm-@LLVM_VERSION@/bin/clang-include-fixer usr/lib/llvm-@LLVM_VERSION@/bin/find-all-symbols -usr/lib/llvm-@LLVM_VERSION@/bin/clangd usr/lib/llvm-@LLVM_VERSION@/bin/clang-refactor usr/lib/llvm-@LLVM_VERSION@/bin/diagtool usr/lib/llvm-@LLVM_VERSION@/bin/hmaptool @@ -50,7 +49,6 @@ usr/bin/find-all-symbols-@LLVM_VERSION@ usr/bin/clang-include-fixer-@LLVM_VERSION@ usr/bin/clang-change-namespace-@LLVM_VERSION@ usr/bin/clang-import-test-@LLVM_VERSION@ -usr/bin/clangd-@LLVM_VERSION@ usr/bin/clang-refactor-@LLVM_VERSION@ usr/bin/diagtool-@LLVM_VERSION@ usr/bin/hmaptool-@LLVM_VERSION@ diff --git a/debian/clangd-X.Y.install.in b/debian/clangd-X.Y.install.in new file mode 100644 index 00000000..32cec274 --- /dev/null +++ b/debian/clangd-X.Y.install.in @@ -0,0 +1,3 @@ +usr/lib/llvm-@LLVM_VERSION@/bin/clangd +usr/bin/clangd-@LLVM_VERSION@ + diff --git a/debian/clangd-X.Y.manpages.in b/debian/clangd-X.Y.manpages.in new file mode 100644 index 00000000..1ac3b604 --- /dev/null +++ b/debian/clangd-X.Y.manpages.in @@ -0,0 +1 @@ +debian/man/clangd-@LLVM_VERSION@.1 \ No newline at end of file diff --git a/debian/control b/debian/control index 55021912..86c233e1 100644 --- a/debian/control +++ b/debian/control @@ -55,8 +55,7 @@ Description: clang-based tools for C/C++ developments Clang implements all of the ISO C++ 1998, 11 and 14 standards and also provides most of the support of C++17. . - This package contains some clang-based tools like scan-build, clangd, - clang-cl, etc. + This package contains some clang-based tools like scan-build, clang-cl, etc. Package: clang-format-8 Architecture: any @@ -85,6 +84,21 @@ Description: clang-based C++ linter tool via static analysis. clang-tidy is modular and provides a convenient interface for writing new checks. +Package: clangd-8 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: clang-tools-8 (<< 8.0.1-1) +Breaks: clang-tools-8 (<< 8.0.1-1) +Description: Language server that provides IDE-like features to editors + clangd understands your C++ code and adds smart features to your editor: + - code completion + - compile errors + - go-to-definition + - and more. + . + clangd is a language server that implements the Language Server Protocol; + it can work with many editors through a plugin. + Package: clang-8-doc Architecture: all Section: doc diff --git a/debian/rules b/debian/rules index ce7faf8c..fe6a8bff 100755 --- a/debian/rules +++ b/debian/rules @@ -535,7 +535,7 @@ build_doc: 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-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang++ clang-tblgen clang-check clang-cpp clang-import-test 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"; \ + CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang++ clang-tblgen clang-check clang-cpp clang-import-test 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"; \ 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)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ From 9b316ef1677602a7c6c59a810662eae825f6474c Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2019 18:57:29 +0200 Subject: [PATCH 2/8] Fix wrong generation of libomp5 dependency instead of libomp5-X one (this is an issue when you explicitly want a libomp-X instead of the latest libomp-X+1, since they aren't coinstallable) --- debian/libomp5-X.Y.symbols.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Y.symbols.in index 1889b329..dd582e58 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Y.symbols.in @@ -1,4 +1,4 @@ -libomp.so.5 libomp5 #MINVER# +libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# GOMP_1.0@GOMP_1.0 0.20131209 GOMP_2.0@GOMP_2.0 0.20131209 GOMP_3.0@GOMP_3.0 0.20131209 From e96a28556bc482d84e3c9ec9f9db214345b92043 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2019 19:07:04 +0200 Subject: [PATCH 3/8] update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ff452f28..319b860e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-8 (1:8.0.1-2) UNRELEASED; urgency=medium + + * Fixed wrong shlib generation of libomp5 library + + -- Gianfranco Costamagna Thu, 01 Aug 2019 19:06:46 +0200 + llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium * New stable release From 0635ece60642a71506ca01115339a5f70f5c0aea Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 2 Aug 2019 08:41:03 +0200 Subject: [PATCH 4/8] Fix wrong shlibs libomp5 generation --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index fe6a8bff..15e55333 100755 --- a/debian/rules +++ b/debian/rules @@ -705,7 +705,7 @@ override_dh_makeshlibs: dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" -- -c4 dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:8~svn298832-1~)" - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:8~svn298832-1~)" + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" dh_makeshlibs --remaining-packages override_dh_shlibdeps: From f43a513ac2e6f60b62fe884b589a2c7ff5b7acf4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 2 Aug 2019 20:36:15 +0200 Subject: [PATCH 5/8] fix changelog --- debian/changelog | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 319b860e..881e5787 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,12 @@ -llvm-toolchain-8 (1:8.0.1-2) UNRELEASED; urgency=medium - - * Fixed wrong shlib generation of libomp5 library - - -- Gianfranco Costamagna Thu, 01 Aug 2019 19:06:46 +0200 - llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium * New stable release * Ship python3-lldb-8 as a new package * Ship clangd-8 as a new package (Closes: #932432) + [ Gianfranco Costamagna ] + * Fixed wrong shlib generation of libomp5 library + -- Sylvestre Ledru Sat, 27 Jul 2019 23:50:48 +0200 llvm-toolchain-8 (1:8.0.1~+rc4-2) unstable; urgency=medium From 4e4e4b15442b2e64fc613808a8d0a98c09e55cb1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 2 Aug 2019 21:18:52 +0200 Subject: [PATCH 6/8] fix the date --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 881e5787..cd9cf8e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium [ Gianfranco Costamagna ] * Fixed wrong shlib generation of libomp5 library - -- Sylvestre Ledru Sat, 27 Jul 2019 23:50:48 +0200 + -- Sylvestre Ledru Fri, 02 Aug 2019 21:18:40 +0200 llvm-toolchain-8 (1:8.0.1~+rc4-2) unstable; urgency=medium From 006c0e8ff583d45cdc74d1051c08dfb583a2bf0c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 3 Aug 2019 11:33:35 +0200 Subject: [PATCH 7/8] fix the path for the help2man generation --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 15e55333..7d368bb3 100755 --- a/debian/rules +++ b/debian/rules @@ -538,7 +538,7 @@ build_doc: CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang++ clang-tblgen clang-check clang-cpp clang-import-test 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"; \ 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)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ + 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; \ done if test "$(OPENMP_ENABLE)" = yes; then \ cd openmp/runtime && doxygen doc/doxygen/config; cd -; \ From 5b96f93a454480389dcb6df0c21a63d066facddf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 3 Aug 2019 11:44:36 +0200 Subject: [PATCH 8/8] update of the date --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cd9cf8e5..951d2920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium [ Gianfranco Costamagna ] * Fixed wrong shlib generation of libomp5 library - -- Sylvestre Ledru Fri, 02 Aug 2019 21:18:40 +0200 + -- Sylvestre Ledru Sat, 03 Aug 2019 11:44:29 +0200 llvm-toolchain-8 (1:8.0.1~+rc4-2) unstable; urgency=medium