From e4a0a5c87a2c3fab6a04e43c75ec0d04cc40ca37 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jul 2019 00:46:57 +0200 Subject: [PATCH 01/20] fix the patch --- .../patches/0050-Remove-explicit-python-version-list.patch | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/patches/0050-Remove-explicit-python-version-list.patch b/debian/patches/0050-Remove-explicit-python-version-list.patch index 220e6cba..ecab55e9 100644 --- a/debian/patches/0050-Remove-explicit-python-version-list.patch +++ b/debian/patches/0050-Remove-explicit-python-version-list.patch @@ -12,12 +12,6 @@ Index: llvm-toolchain-9_9~svn366428/CMakeLists.txt =================================================================== --- llvm-toolchain-9_9~svn366428.orig/CMakeLists.txt +++ llvm-toolchain-9_9~svn366428/CMakeLists.txt -@@ -1,4 +1,4 @@ --# See docs/CMake.html for instructions about how to build LLVM with CMake. -+FindPythonInterp# See docs/CMake.html for instructions about how to build LLVM with CMake. - - cmake_minimum_required(VERSION 3.4.3) - @@ -643,7 +643,7 @@ option(LLVM_ENABLE_PLUGINS "Enable plugi include(HandleLLVMOptions) From b3fd0b62b20657cf9ba395079f2626a1f9ad4c96 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Jul 2019 23:55:39 +0200 Subject: [PATCH 02/20] New stable release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5b19d26e..eaa72e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium + + * New stable release + + -- Sylvestre Ledru Sat, 27 Jul 2019 23:50:48 +0200 + llvm-toolchain-8 (1:8.0.1~+rc4-2) unstable; urgency=medium * Compile against Python 3 From 48cbd5bfc9f079dc32b3c77a560f1a4242d054d0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 14 Jul 2019 17:22:25 +0200 Subject: [PATCH 03/20] Ship python3-lldb-8 as a new package --- debian/changelog | 1 + debian/control | 16 ++++++++++++++++ debian/python3-lldb-X.Y.install.in | 1 + debian/rules | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 debian/python3-lldb-X.Y.install.in diff --git a/debian/changelog b/debian/changelog index eaa72e89..3861c675 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium * New stable release + * Ship python3-lldb-8 as a new package -- Sylvestre Ledru Sat, 27 Jul 2019 23:50:48 +0200 diff --git a/debian/control b/debian/control index 767e1769..55021912 100644 --- a/debian/control +++ b/debian/control @@ -456,6 +456,22 @@ Description: Next generation, high-performance debugger, python lib This binding package provides access to lldb. +Package: python3-lldb-8 +Section: python +Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m69k sh4 x32 +# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-six +Conflicts: python3-lldb-x.y +Replaces: python3-lldb-x.y +Provides: python3-lldb-x.y +Pre-Depends: ${misc:Pre-Depends} +Description: Next generation, high-performance debugger, python3 lib + LLDB is a next generation, high-performance debugger. It is built as a set of + reusable components which highly leverage existing libraries in the larger LLVM + Project, such as the Clang expression parser and LLVM disassembler. + . + This binding package provides access to lldb. + Package: liblldb-8-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 diff --git a/debian/python3-lldb-X.Y.install.in b/debian/python3-lldb-X.Y.install.in new file mode 100644 index 00000000..f9a707c3 --- /dev/null +++ b/debian/python3-lldb-X.Y.install.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/python*/site-packages/lldb/ \ No newline at end of file diff --git a/debian/rules b/debian/rules index e0fbc92b..3531d99b 100755 --- a/debian/rules +++ b/debian/rules @@ -615,7 +615,7 @@ endif # Don't think it is used rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a # Probably useless - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/six.py + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/six.py $(MAKE) -C libcxxabi/build install DESTDIR=$(DEB_INST) $(MAKE) -C libcxx/build install DESTDIR=$(DEB_INST) From 1037ae5f968a51db318a49574b75d78bd832ee09 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 29 Jul 2019 18:15:09 +0200 Subject: [PATCH 04/20] workaround --- debian/liblldb-X.Y.install.in | 2 +- debian/rules | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Y.install.in index 73f1b98b..5250d4a1 100644 --- a/debian/liblldb-X.Y.install.in +++ b/debian/liblldb-X.Y.install.in @@ -1,4 +1,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so +usr/lib/llvm-@LLVM_VERSION@/lib/python*/site-packages/readline.so usr/lib/llvm-@LLVM_VERSION@/lib/liblldbIntelFeatures.so.* diff --git a/debian/rules b/debian/rules index e0fbc92b..affa77bb 100755 --- a/debian/rules +++ b/debian/rules @@ -530,8 +530,10 @@ build_doc: done mkdir -p debian/man/ - help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 - help2man --no-info --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 + ls -al clang/tools/scan-view/bin/scan-view + clang/tools/scan-view/bin/scan-view --help || true + 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"; \ for f in $$CMDS; do \ From e3067c78a8c0e9bd4ac5978cc6a01460d4e257b2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 29 Jul 2019 18:47:55 +0200 Subject: [PATCH 05/20] New snapshot release --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce6515f9..8b0a66c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-9 (1:9~svn366428-1) unstable; urgency=medium +llvm-toolchain-9 (1:9~+rc1-1~exp1) UNRELEASED; urgency=medium - * New branch (9) + * New snapshot release - -- Sylvestre Ledru Thu, 18 Jul 2019 16:54:14 +0200 + -- Sylvestre Ledru Mon, 29 Jul 2019 18:42:26 +0200 llvm-toolchain-snapshot (1:9~svn366022-1~exp1) experimental; urgency=medium From 2076048abb690ad8902fba7fd0b8de80aafcf68f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 29 Jul 2019 22:34:16 +0200 Subject: [PATCH 06/20] fix version --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c21105eb..a02307d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-9 (1:9~+rc1-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-9 (1:9~+rc1-1~exp1) experimental; urgency=medium * New snapshot release - -- Sylvestre Ledru Mon, 29 Jul 2019 18:42:26 +0200 + -- Sylvestre Ledru Mon, 29 Jul 2019 22:16:33 +0200 llvm-toolchain-snapshot (1:9~svn366022-1~exp1) experimental; urgency=medium From 3572677549bdc343d9db31c4a9de4ea738ce1848 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 30 Jul 2019 09:11:15 +0200 Subject: [PATCH 07/20] fix a typo --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a992132d..0bd239e7 100644 --- a/debian/control +++ b/debian/control @@ -60,7 +60,7 @@ Description: clang-based tools for C/C++ developments Package: clang-format-9 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python,3 +Depends: ${shlibs:Depends}, ${misc:Depends}, python3 libllvm9 (= ${binary:Version}) Description: Tool to format C/C++/Obj-C code Clang-format is both a library and a stand-alone tool with the goal of From 47ca25d5db47ee424a7b53428415c68f279ffc80 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 31 Jul 2019 09:16:24 +0200 Subject: [PATCH 08/20] fix syntax --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 0bd239e7..4715e134 100644 --- a/debian/control +++ b/debian/control @@ -60,7 +60,7 @@ Description: clang-based tools for C/C++ developments Package: clang-format-9 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3 +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libllvm9 (= ${binary:Version}) Description: Tool to format C/C++/Obj-C code Clang-format is both a library and a stand-alone tool with the goal of From 446e6cf9bed6f082a3fdb5a966481a697e941b57 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 31 Jul 2019 22:37:51 +0200 Subject: [PATCH 09/20] 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 10/20] 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 5a7dcf706077b179da8b6d78d0752ce23cbbb1db Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2019 18:57:29 +0200 Subject: [PATCH 11/20] 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 3f0430fd..cf88e64b 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 5babcf49556097e49a09ca5ea470f4ff268b7744 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2019 19:06:32 +0200 Subject: [PATCH 12/20] Update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a02307d6..7a4af5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-9 (1:9~+rc1-1~exp2) UNRELEASED; urgency=medium + + * Fixed wrong shlib generation of libomp5 library + + -- Gianfranco Costamagna Thu, 01 Aug 2019 19:06:11 +0200 + llvm-toolchain-9 (1:9~+rc1-1~exp1) experimental; urgency=medium * New snapshot release From e96a28556bc482d84e3c9ec9f9db214345b92043 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 1 Aug 2019 19:07:04 +0200 Subject: [PATCH 13/20] 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 14/20] 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 73fd7c35e4dc6c1af5e1c4f5d44c125b861ae582 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 2 Aug 2019 08:41:03 +0200 Subject: [PATCH 15/20] Fix wrong shlibs libomp5 generation --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 52e87d2d..730d2c1d 100755 --- a/debian/rules +++ b/debian/rules @@ -714,7 +714,7 @@ override_dh_makeshlibs: dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" -- -c4 dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:9~svn298832-1~)" - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:9~svn298832-1~)" + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:9~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 16/20] 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 17/20] 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 18/20] 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 76aee64f84861c4afed1236f9a0f183b21952857 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 3 Aug 2019 11:43:50 +0200 Subject: [PATCH 19/20] Move lit-cpuid from llvm-tools to lldb (wrong package) --- debian/changelog | 6 +++++- debian/control | 2 ++ debian/lldb-X.Y.install.in | 2 ++ debian/llvm-X.Y-tools.install.in | 2 -- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a4af5c5..a5af68f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-9 (1:9~+rc1-1~exp2) UNRELEASED; urgency=medium + [ Gianfranco Costamagna ] * Fixed wrong shlib generation of libomp5 library - -- Gianfranco Costamagna Thu, 01 Aug 2019 19:06:11 +0200 + [ Sylvestre Ledru ] + * Move lit-cpuid from llvm-tools to lldb (wrong package) + + -- Sylvestre Ledru Sat, 03 Aug 2019 11:41:07 +0200 llvm-toolchain-9 (1:9~+rc1-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 4715e134..cf19c921 100644 --- a/debian/control +++ b/debian/control @@ -442,6 +442,8 @@ Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}), llvm-9-dev, python-lldb-9 Pre-Depends: ${misc:Pre-Depends} +Replaces: llvm-9-tools (<< 9~+rc1-1~exp2) +Breaks: llvm-9-tools (<< 9~+rc1-1~exp2) Description: Next generation, high-performance debugger LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in index eff6bd03..d6ed3057 100644 --- a/debian/lldb-X.Y.install.in +++ b/debian/lldb-X.Y.install.in @@ -2,6 +2,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb* usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi* usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server* usr/lib/llvm-@LLVM_VERSION@/bin/lldb-argdumper +usr/lib/llvm-@LLVM_VERSION@/bin/lit-cpuid usr/bin/lldb-@LLVM_VERSION@* usr/bin/lldb-server-@LLVM_VERSION@* @@ -9,3 +10,4 @@ usr/bin/lldb-mi-@LLVM_VERSION@* usr/bin/lldb-argdumper-@LLVM_VERSION@ usr/bin/lldb-vscode-@LLVM_VERSION@ usr/bin/lldb-instr-@LLVM_VERSION@ +usr/bin/lit-cpuid-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in index 16573d01..282dd225 100644 --- a/debian/llvm-X.Y-tools.install.in +++ b/debian/llvm-X.Y-tools.install.in @@ -2,7 +2,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/count usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck usr/lib/llvm-@LLVM_VERSION@/bin/not -usr/lib/llvm-@LLVM_VERSION@/bin/lit-cpuid usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-viewer.py usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/optrecord.py usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/style.css @@ -15,4 +14,3 @@ utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ usr/bin/count-@LLVM_VERSION@ usr/bin/FileCheck-@LLVM_VERSION@ usr/bin/not-@LLVM_VERSION@ -usr/bin/lit-cpuid-@LLVM_VERSION@ \ No newline at end of file From 5b96f93a454480389dcb6df0c21a63d066facddf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 3 Aug 2019 11:44:36 +0200 Subject: [PATCH 20/20] 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