diff --git a/debian/changelog b/debian/changelog index fa7252ce..c5d0973a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ llvm-toolchain-snapshot (1:6.0~svn315736-2) unstable; 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. + (Closes: #836397) * Also ship ld64.lld and wasm-ld in the lld-X.Y package * Update d/rules to reflect the move of libfuzzer into compiler-rt * Update of the copyright file (Closes: #878502) diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 777826f9..dc145ec3 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -1,63 +1,10 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang usr/lib/llvm-@LLVM_VERSION@/bin/clang++ usr/lib/llvm-@LLVM_VERSION@/bin/clang-cpp -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 -usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-rename.el -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-rename.py -usr/lib/llvm-@LLVM_VERSION@/bin/scan-view -usr/lib/llvm-@LLVM_VERSION@/bin/scan-build -usr/lib/llvm-@LLVM_VERSION@/bin/clang-cl -usr/lib/llvm-@LLVM_VERSION@/bin/sancov -usr/lib/llvm-@LLVM_VERSION@/share/scan-view/ -usr/lib/llvm-@LLVM_VERSION@/share/scan-build/ -usr/lib/llvm-@LLVM_VERSION@/share/man/man1/scan-build.1 -usr/lib/llvm-@LLVM_VERSION@/share/clang/bash-autocomplete.sh -usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer -usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer -usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-bundler -usr/lib/llvm-@LLVM_VERSION@/bin/clang-reorder-fields -usr/lib/llvm-@LLVM_VERSION@/bin/clang-change-namespace -usr/lib/llvm-@LLVM_VERSION@/bin/clang-import-test -usr/lib/llvm-@LLVM_VERSION@/bin/clangd -usr/lib/llvm-@LLVM_VERSION@/bin/clang-refactor -usr/lib/llvm-@LLVM_VERSION@/bin/clang-func-mapping -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 - -tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ -tools/clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ -tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ #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/run-find-all-symbols.py -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py -usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.el usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang-cpp-@LLVM_VERSION@ -usr/bin/clang-check-@LLVM_VERSION@ -usr/bin/clang-apply-replacements-@LLVM_VERSION@ -usr/bin/clang-query-@LLVM_VERSION@ -usr/bin/clang-rename-@LLVM_VERSION@ -usr/bin/sancov-@LLVM_VERSION@ -usr/bin/clang-cl-@LLVM_VERSION@ -usr/bin/modularize-@LLVM_VERSION@ -usr/bin/scan-build-@LLVM_VERSION@ -usr/bin/scan-view-@LLVM_VERSION@ -usr/bin/c-index-test-@LLVM_VERSION@ -usr/bin/clang-offload-bundler-@LLVM_VERSION@ -usr/bin/clang-reorder-fields-@LLVM_VERSION@ -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/clang-func-mapping-@LLVM_VERSION@ \ No newline at end of file diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index ab2dbaed..a389e011 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -1,9 +1,2 @@ -# I know but well... -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz # Does not link otherwise clang-@LLVM_VERSION@: embedded-library usr/lib/llvm-@LLVM_VERSION@/bin/clang: libjsoncpp diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index 07c26616..b19400af 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -1,12 +1 @@ clang/docs/_build/man/clang-@LLVM_VERSION@.1 -clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 -debian/man/clang-check-@LLVM_VERSION@.1 -debian/man/clang-rename-@LLVM_VERSION@.1 -debian/man/clang-query-@LLVM_VERSION@.1 -debian/man/clang-apply-replacements-@LLVM_VERSION@.1 -debian/man/sancov-@LLVM_VERSION@.1 -debian/man/scan-view-@LLVM_VERSION@.1 -debian/man/modularize-@LLVM_VERSION@.1 -debian/man/find-all-symbols-@LLVM_VERSION@.1 -debian/man/clang-include-fixer-@LLVM_VERSION@.1 -debian/man/clang-reorder-fields-@LLVM_VERSION@.1 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in new file mode 100644 index 00000000..fed92633 --- /dev/null +++ b/debian/clang-tools-X.Y.install.in @@ -0,0 +1,54 @@ +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 +usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-rename.el +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-rename.py +usr/lib/llvm-@LLVM_VERSION@/bin/scan-view +usr/lib/llvm-@LLVM_VERSION@/bin/scan-build +usr/lib/llvm-@LLVM_VERSION@/bin/clang-cl +usr/lib/llvm-@LLVM_VERSION@/bin/sancov +usr/lib/llvm-@LLVM_VERSION@/share/scan-view/ +usr/lib/llvm-@LLVM_VERSION@/share/scan-build/ +usr/lib/llvm-@LLVM_VERSION@/share/man/man1/scan-build.1 +usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer +usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer +usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-bundler +usr/lib/llvm-@LLVM_VERSION@/bin/clang-reorder-fields +usr/lib/llvm-@LLVM_VERSION@/bin/clang-change-namespace +usr/lib/llvm-@LLVM_VERSION@/bin/clang-import-test +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/clang-func-mapping + +tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ +tools/clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ +tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ + +usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.el +usr/bin/clang-check-@LLVM_VERSION@ +usr/bin/clang-apply-replacements-@LLVM_VERSION@ +usr/bin/clang-query-@LLVM_VERSION@ +usr/bin/clang-rename-@LLVM_VERSION@ +usr/bin/sancov-@LLVM_VERSION@ +usr/bin/clang-cl-@LLVM_VERSION@ +usr/bin/modularize-@LLVM_VERSION@ +usr/bin/scan-build-@LLVM_VERSION@ +usr/bin/scan-view-@LLVM_VERSION@ +usr/bin/c-index-test-@LLVM_VERSION@ +usr/bin/clang-offload-bundler-@LLVM_VERSION@ +usr/bin/clang-reorder-fields-@LLVM_VERSION@ +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/clang-func-mapping-@LLVM_VERSION@ + diff --git a/debian/clang-X.Y.links.in b/debian/clang-tools-X.Y.links.in similarity index 100% rename from debian/clang-X.Y.links.in rename to debian/clang-tools-X.Y.links.in diff --git a/debian/clang-tools-X.Y.lintian-overrides.in b/debian/clang-tools-X.Y.lintian-overrides.in new file mode 100644 index 00000000..eb04eb71 --- /dev/null +++ b/debian/clang-tools-X.Y.lintian-overrides.in @@ -0,0 +1,6 @@ +# I know but well... +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz +clang-tools-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz diff --git a/debian/clang-tools-X.Y.manpages.in b/debian/clang-tools-X.Y.manpages.in new file mode 100644 index 00000000..5cb7dbd0 --- /dev/null +++ b/debian/clang-tools-X.Y.manpages.in @@ -0,0 +1,11 @@ +clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 +debian/man/clang-check-@LLVM_VERSION@.1 +debian/man/clang-rename-@LLVM_VERSION@.1 +debian/man/clang-query-@LLVM_VERSION@.1 +debian/man/clang-apply-replacements-@LLVM_VERSION@.1 +debian/man/sancov-@LLVM_VERSION@.1 +debian/man/scan-view-@LLVM_VERSION@.1 +debian/man/modularize-@LLVM_VERSION@.1 +debian/man/find-all-symbols-@LLVM_VERSION@.1 +debian/man/clang-include-fixer-@LLVM_VERSION@.1 +debian/man/clang-reorder-fields-@LLVM_VERSION@.1 diff --git a/debian/control b/debian/control index 72433033..518ff19c 100644 --- a/debian/control +++ b/debian/control @@ -14,12 +14,12 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, # ocaml-findlib [amd64 arm64 armel armhf i386 ppc64el s390x], # libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x], # dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x], -Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.1.0 Homepage: http://www.llvm.org/ -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ -Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/ +Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/5.0/ +Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/5.0/ # ------------- clang ------------- @@ -31,27 +31,31 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-6.0-dev, python Suggests: gnustep, gnustep-devel, clang-6.0-doc, libomp-dev -Replaces: clang-3.1, clang-3.2, clang-3.3, - clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt, - clang-include-fixer-6.0 -Breaks: clang-3.1, clang-3.2, clang-3.3, - clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt, - clang-include-fixer-6.0 -Description: C, C++ and Objective-C compiler (LLVM based) +Description: C, C++ and Objective-C compiler Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + Clang implements all of the ISO C++ 1998, 11 and 14 standards and also + provides most of the support of C++17. + +Package: clang-tools-5.0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-5.0 (= ${binary:Version}) +Description: C, C++ and Objective-C compiler + Clang project is a C, C++, Objective C and Objective C++ front-end + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). + . + 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. Package: clang-format-6.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, libllvm6.0 (= ${binary:Version}) -Replaces: clang-format-3.3 -Breaks: clang-format-3.3 Description: Tool to format C/C++/Obj-C code Clang-format is both a library and a stand-alone tool with the goal of automatically reformatting C++ sources files according to configurable @@ -80,30 +84,29 @@ Package: clang-6.0-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C, C++ and Objective-C compiler (LLVM based) - Documentation +Description: C, C++ and Objective-C compiler - Documentation Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + 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 the documentation. Package: libclang1-6.0 +Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: C interface to the clang library Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + 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 the clang library. . @@ -117,16 +120,15 @@ Package: libclang1-6.0-dbg Architecture: any Multi-Arch: same Section: debug -Priority: extra +Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-6.0 (= ${binary:Version}) -Description: clang library +Description: clang library (debug) Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + 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 the debugging symbols. @@ -138,12 +140,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang-common-6.0-dev (= ${binary:Version}) Description: clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + 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 the clang headers to develop extensions over libclang1-6.0. @@ -154,12 +155,11 @@ Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm6.0 (= ${binary:Version}) Description: clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + 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 the clang generic headers and some libraries (profiling, etc). @@ -190,18 +190,17 @@ Package: python-clang-6.0 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python -Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.7, python-clang-3.8, python-clang-3.9, python-clang-x.y -Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.7, python-clang-3.8, python-clang-3.9 +Replaces: python-clang-3.8, python-clang-3.9, python-clang-x.y +Breaks: python-clang-3.8, python-clang-3.9 Conflicts: python-clang-x.y Provides: python-clang-x.y Description: Clang Python Bindings Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + Clang implements all of the ISO C++ 1998, 11 and 14 standards and also + provides most of the support of C++17. . This binding package provides access to the Clang compiler and libraries. @@ -212,12 +211,11 @@ Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} Description: Clang examples Clang project is a C, C++, Objective C and Objective C++ front-end - for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler - Collection (GCC). + based on the LLVM compiler. Its goal is to offer a replacement to the + GNU Compiler Collection (GCC). . - Clang fully implements all published ISO C++ standards including C++11, as - well as the upcoming C++14 standard, and some parts of the fledgling C++1z - standard, and is considered a production-quality C++ compiler. + 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 the clang examples. @@ -241,7 +239,7 @@ Description: Modular compiler and toolchain technologies, runtime library Package: libllvm6.0-dbg Architecture: any Section: debug -Priority: extra +Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm6.0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same @@ -437,7 +435,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hp Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-6.0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: debug -Priority: extra +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 @@ -467,7 +465,6 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc al # ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm6.0 (= ${binary:Version}), llvm-6.0-dev, python-lldb-6.0 -Conflicts: lldb-3.4, lldb-3.5 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger LLDB is a next generation, high-performance debugger. It is built as a set of @@ -495,7 +492,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hp Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-6.0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: debug -Priority: extra +Priority: optional Description: Next generation, high-performance debugger, debugging libraries 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 @@ -509,8 +506,7 @@ Section: python Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe sh4 x32 mips mipsel arm64 # ia64 mips mipsel hurd ppc64 ppc64el alpha s390x powerpc sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-6.0-dev, python, python-six -Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7, python-lldb-3.8, - python-lldb-3.9, python-lldb-x.y +Conflicts: python-lldb-3.8, python-lldb-3.9, python-lldb-x.y Replaces: python-lldb-x.y Provides: python-lldb-x.y Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/liblld-X.Y.links.in b/debian/liblld-X.Y.links.in index b9b629f8..5d16d10b 100644 --- a/debian/liblld-X.Y.links.in +++ b/debian/liblld-X.Y.links.in @@ -1,3 +1,4 @@ usr/lib/@DEB_HOST_MULTIARCH@/liblld-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblld-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/liblld-@LLVM_VERSION@.so usr/lib/python2.7/dist-packages/lld-@LLVM_VERSION@/_lld.so usr/lib/@DEB_HOST_MULTIARCH@/liblld-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblld.so.1 + diff --git a/debian/liblldb-X.Y-dev.links.in b/debian/liblldb-X.Y-dev.links.in index 18e13a51..3c6aef90 100644 --- a/debian/liblldb-X.Y-dev.links.in +++ b/debian/liblldb-X.Y-dev.links.in @@ -1,2 +1,3 @@ usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so - +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Y.links.in index a222fbc6..ae73a199 100644 --- a/debian/liblldb-X.Y.links.in +++ b/debian/liblldb-X.Y.links.in @@ -1,3 +1,2 @@ usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 - diff --git a/debian/lld-X.Y.manpages.in b/debian/lld-X.Y.manpages.in index 49a3f66c..51943dc6 100644 --- a/debian/lld-X.Y.manpages.in +++ b/debian/lld-X.Y.manpages.in @@ -1,2 +1 @@ debian/man/ld.lld-@LLVM_VERSION@.1 - diff --git a/debian/patches/gcc-7.1-workaround.diff b/debian/patches/gcc-7.1-workaround.diff new file mode 100644 index 00000000..e69de29b diff --git a/debian/patches/series b/debian/patches/series index a89bb97b..017d8a4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,7 +35,6 @@ disable-llvm-symbolizer-test.diff clang-tidy-run-bin.diff #bug-30342.diff fix-scan-view-path.diff -#0011-SimplifyCFG-Hoisting-invalidates-metadata.patch #clang-fix-cmpxchg8-detection-on-i386.patch lldb-addversion-suffix-to-llvm-server-exec.patch lldb-missing-install.diff diff --git a/debian/rules b/debian/rules index cabc4205..582944c0 100755 --- a/debian/rules +++ b/debian/rules @@ -162,6 +162,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) # OCAML_STDLIB_DIR ?= $(shell ocamlc -where) # DH_OPTIONS=--with ocaml endif +# Force the deactivation of ocaml until the transition is done +OCAML_ENABLE=no LIBFUZZER_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH_OS),linux)) diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index d8bc77ee..1039d839 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -5,4 +5,5 @@ source: outdated-autotools-helper-file autoconf/config.guess 2011-08-20 source: outdated-autotools-helper-file autoconf/config.sub 2011-11-02 # Reported here https://bugs.llvm.org/show_bug.cgi?id=32962 # No activity, silent it to avoid false positive in automation -source: license-problem-convert-utf-code lib/Support/ConvertUTF.cpp \ No newline at end of file +source: license-problem-convert-utf-code lib/Support/ConvertUTF.cpp +