From fb40b3780f82110531818e5db8b218eeba5692e4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 1 Mar 2020 22:29:27 +0100 Subject: [PATCH 01/11] Add a libclang-cpp10-dev package (needed to unbreak the cmake) https://bugs.llvm.org/show_bug.cgi?id=42432 --- debian/changelog | 2 ++ debian/control | 27 +++++++++++++++++++++++++++ debian/libclang-X.Y-dev.install.in | 3 ++- debian/libclang-cppX.Y-dev.install.in | 1 + debian/rules | 1 + 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 debian/libclang-cppX.Y-dev.install.in diff --git a/debian/changelog b/debian/changelog index a531eaa0..31189849 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-10 (1:10.0.0~+rc2-3) unstable; urgency=medium * Disable libfuzzer on x86 https://bugs.llvm.org/show_bug.cgi?id=43677 FTBFS otherwise + * Add a libclang-cpp10-dev package (needed to unbreak the cmake) + https://bugs.llvm.org/show_bug.cgi?id=42432 -- Sylvestre Ledru Sun, 01 Mar 2020 20:59:25 +0100 diff --git a/debian/control b/debian/control index aa197230..9721ba0e 100644 --- a/debian/control +++ b/debian/control @@ -188,6 +188,33 @@ Description: C++ interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. +Package: libclang-cpp10-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, + libclang-cpp10 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp10.dev +Breaks: libclang-10-dev (<< 1:10.0.0~+rc2-3) +Replaces: libclang-10-dev (<< 1:10.0.0~+rc2-3) +Description: C++ interface to the Clang library + 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 the Clang C++ library. + . + The C++ Interface to Clang provides an API that exposes + facilities for parsing source code into an abstract syntax tree (AST), + loading already-parsed ASTs, traversing the AST, associating physical source + locations with elements within the AST, and other facilities that support + Clang-based development tools. + . + This package contains the Clang headers to develop extensions over + libclang-cpp10. + Package: libfuzzer-10-dev Architecture: linux-any diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index 55889786..e8653734 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,5 +1,6 @@ usr/lib/llvm-@LLVM_VERSION@/include/clang usr/lib/llvm-@LLVM_VERSION@/include/clang-c usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a -usr/lib/llvm-@LLVM_VERSION@/lib/libclang*so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in new file mode 100644 index 00000000..925548f0 --- /dev/null +++ b/debian/libclang-cppX.Y-dev.install.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION^.so diff --git a/debian/rules b/debian/rules index 8e224ad9..b9db5a59 100755 --- a/debian/rules +++ b/debian/rules @@ -552,6 +552,7 @@ override_dh_auto_install: chrpath -d libcxx/build/lib/libc++.so.1.0 cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ + cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-cpp$(LLVM_VERSION).so; \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT) cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang-cpp.so.$(LLVM_VERSION) libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT); \ From 09fa7cd27f1efef1fca9f55352e56bd85537f90e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 09:13:24 +0100 Subject: [PATCH 02/11] fix a typo --- debian/libclang-cppX.Y-dev.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in index 925548f0..cc6dc637 100644 --- a/debian/libclang-cppX.Y-dev.install.in +++ b/debian/libclang-cppX.Y-dev.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION^.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION@.so From 12cac26c3bbff3b976bc288667bb373135e984b4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 14:56:15 +0100 Subject: [PATCH 03/11] libclangcpp dev create the necessary sylink --- debian/libclang-cppX.Y.links.in | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index 8ad00921..80607601 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1 +1,2 @@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 +/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so \ No newline at end of file From bee8cbe1a5531e3b040a3f97e0de63a560adcabd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 18:51:50 +0100 Subject: [PATCH 04/11] fix links? --- debian/libclang-cppX.Y.links.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index 80607601..25ea0505 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1,2 +1,4 @@ -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so \ No newline at end of file +usr/lib/x86_64-linux-gnu/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 +/usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 usr/lib/llvm-@LLVM_VERSION@/libclang-cpp-@LLVM_VERSION@.so.1 +/usr/lib/x86_64-linux-gnu/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/x86_64-linux-gnu/libclang-cpp@LLVM_VERSION@.so +/usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ From 375bb31d3523fc909c6b3396f33ec7ae4e31c067 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 18:56:51 +0100 Subject: [PATCH 05/11] add liclang-cpp10-dev in the list --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 0002456e..2f73dd00 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -9,7 +9,7 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") DETAILED_VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p") DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) -LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb" +LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*'" echo "sudo dpkg -i $LIST" From db2178ef496e7aed6e89fd0bca3913dbc5863870 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 18:57:26 +0100 Subject: [PATCH 06/11] Fix the libclang-cpp* packages --- debian/changelog | 1 + debian/libclang-cppX.Y-dev.install.in | 2 +- debian/libclang-cppX.Y-dev.links.in | 1 + debian/libclang-cppX.Y.install.in | 2 -- debian/libclang-cppX.Y.links.in | 3 +-- debian/rules | 7 ++----- 6 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 debian/libclang-cppX.Y-dev.links.in diff --git a/debian/changelog b/debian/changelog index 31189849..3bf2de6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-10 (1:10.0.0~+rc2-3) unstable; urgency=medium FTBFS otherwise * Add a libclang-cpp10-dev package (needed to unbreak the cmake) https://bugs.llvm.org/show_bug.cgi?id=42432 + This makes libclang-cpp10 usable and polish the links and dups -- Sylvestre Ledru Sun, 01 Mar 2020 20:59:25 +0100 diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in index cc6dc637..5d2609ec 100644 --- a/debian/libclang-cppX.Y-dev.install.in +++ b/debian/libclang-cppX.Y-dev.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so diff --git a/debian/libclang-cppX.Y-dev.links.in b/debian/libclang-cppX.Y-dev.links.in new file mode 100644 index 00000000..a882ad61 --- /dev/null +++ b/debian/libclang-cppX.Y-dev.links.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index a6714393..b0d88e0e 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1,3 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index 80607601..ee382f6d 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1,2 +1 @@ -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so \ No newline at end of file +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ diff --git a/debian/rules b/debian/rules index b9db5a59..01b0e88f 100755 --- a/debian/rules +++ b/debian/rules @@ -551,14 +551,11 @@ override_dh_auto_install: chrpath -d libcxxabi/build/lib/libc++abi.so.1.0 chrpath -d libcxx/build/lib/libc++.so.1.0 + : # libclang cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-cpp$(LLVM_VERSION).so; \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT) - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang-cpp.so.$(LLVM_VERSION) libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT); \ - ln -s libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-cpp.so.$(SONAME_EXT); \ - ln -s libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-cpp.so.$(LLVM_VERSION) - + : # libomp cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ ln -s libomp.so.$(SONAME_OPENMP) libomp.so From afcf091fb015fd08d7de0a579f82cec28cdc0db2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 20:37:42 +0100 Subject: [PATCH 07/11] Fix the *clang* desc as C++17 is supported --- debian/changelog | 1 + debian/control | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3bf2de6a..ad1416b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-10 (1:10.0.0~+rc2-3) unstable; urgency=medium * Add a libclang-cpp10-dev package (needed to unbreak the cmake) https://bugs.llvm.org/show_bug.cgi?id=42432 This makes libclang-cpp10 usable and polish the links and dups + * Fix the *clang* desc as C++17 is supported -- Sylvestre Ledru Sun, 01 Mar 2020 20:59:25 +0100 diff --git a/debian/control b/debian/control index 9721ba0e..253bec63 100644 --- a/debian/control +++ b/debian/control @@ -40,8 +40,8 @@ Description: C, C++ and Objective-C compiler 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. Package: clang-tools-10 Architecture: any @@ -52,8 +52,8 @@ Description: clang-based tools for C/C++ developments 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains some clang-based tools like scan-build, clang-cl, etc. @@ -107,8 +107,8 @@ Description: C, C++ and Objective-C compiler - Documentation 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the documentation. @@ -122,8 +122,8 @@ Description: C interface to the Clang library 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the Clang library. . @@ -144,8 +144,8 @@ Description: Clang library - Development package 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the Clang headers to develop extensions over libclang1-10. @@ -159,8 +159,8 @@ Description: Clang library - Common development package 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the Clang generic headers and some libraries (profiling, etc). @@ -177,8 +177,8 @@ Description: C++ interface to the Clang library 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the Clang C++ library. . @@ -201,8 +201,8 @@ Description: C++ interface to the Clang library 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the Clang C++ library. . @@ -250,8 +250,8 @@ Description: Clang Python Bindings 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This binding package provides access to the Clang compiler and libraries. @@ -265,8 +265,8 @@ Description: Clang examples 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. + Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also + provides most of the support of C++20. . This package contains the Clang examples. From a9153594064de39f0dda4b26cafa4c1122b1f423 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 22:24:53 +0100 Subject: [PATCH 08/11] add missing link for build --- debian/libclang-cppX.Y-dev.install.in | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in index 5d2609ec..0c8c6444 100644 --- a/debian/libclang-cppX.Y-dev.install.in +++ b/debian/libclang-cppX.Y-dev.install.in @@ -1 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so From f79ace5602e0abda328a44c3da03985d82400d0d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 22:28:16 +0100 Subject: [PATCH 09/11] fix the tests --- debian/qualify-clang.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 2f73dd00..372604a1 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -222,12 +222,12 @@ echo "Testing linking clang-cpp ..." clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o > /dev/null || true if ! ldd o 2>&1|grep -q libclang-cpp; then echo "Didn't link against libclang-cpp$VERSION" -# exit 42 + exit 42 fi -#./o > /dev/null +./o > /dev/null # Check that the symlink is correct -ls -al /usr/lib/llvm-$VERSION/lib/libclang-cpp.so.1 > /dev/null +ls -al /usr/lib/llvm-$VERSION/lib/libclang-cpp.so.$VERSION > /dev/null echo "Testing code coverage ..." From 62b143372a4a7d21975275b6d489acfaaa0e3ccd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Mar 2020 08:12:57 +0100 Subject: [PATCH 10/11] fix links --- debian/libclang-cppX.Y-dev.install.in | 1 - debian/libclang-cppX.Y-dev.links.in | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in index 0c8c6444..5d2609ec 100644 --- a/debian/libclang-cppX.Y-dev.install.in +++ b/debian/libclang-cppX.Y-dev.install.in @@ -1,2 +1 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so diff --git a/debian/libclang-cppX.Y-dev.links.in b/debian/libclang-cppX.Y-dev.links.in index a882ad61..8af1177e 100644 --- a/debian/libclang-cppX.Y-dev.links.in +++ b/debian/libclang-cppX.Y-dev.links.in @@ -1 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so From 049407c8a47c4702889f5a0f904ef7f299ee1842 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Mar 2020 10:01:27 +0100 Subject: [PATCH 11/11] remove a link which would prevent lib to be coinstsallable --- debian/libclang-cppX.Y-dev.links.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-cppX.Y-dev.links.in b/debian/libclang-cppX.Y-dev.links.in index 8af1177e..6a96217b 100644 --- a/debian/libclang-cppX.Y-dev.links.in +++ b/debian/libclang-cppX.Y-dev.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION@.so