From e09de8fa039ca518758e092fa9026ccd3481f613 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 5 Mar 2024 23:35:52 +0100 Subject: [PATCH] * Make libclang-common-18-dev architecture dependent. --- debian/changelog | 6 +++++- debian/control | 12 ++++++------ debian/control.in | 12 ++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f9eec53..82f68c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-18 (1:18.1.0~rc4-2) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * Disable libllvmlibc-18-dev on armhf (Closes: #1065503) - -- Sylvestre Ledru Tue, 05 Mar 2024 19:08:29 +0100 + [ Matthias Klose ] + * Make libclang-common-18-dev architecture dependent. + + -- Sylvestre Ledru Tue, 05 Mar 2024 23:31:06 +0100 llvm-toolchain-18 (1:18.1.0~rc4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 903663b6..830b4ec6 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libclang-common-18-dev (= ${binary:Version}), llvm-18-linker-tools (= ${binary:Version}), libclang1-18 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler @@ -96,7 +96,7 @@ Package: clang-tidy-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libclang-common-18-dev (= ${binary:Version}), clang-tools-18, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming @@ -108,7 +108,7 @@ Package: clangd-18 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}), + libclang-common-18-dev (= ${binary:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -161,7 +161,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libclang1-18 (= ${binary:Version}), - libclang-common-18-dev (= ${source:Version}) + libclang-common-18-dev (= ${binary:Version}) Description: Clang library - Development package 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 @@ -174,8 +174,8 @@ Description: Clang library - Development package libclang1-18. Package: libclang-common-18-dev -Architecture: all -Multi-Arch: foreign +Architecture: any +Multi-Arch: same Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libclang-rt-18-dev diff --git a/debian/control.in b/debian/control.in index f6de7a06..741a421c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -47,7 +47,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libllvm@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}), libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler @@ -96,7 +96,7 @@ Package: clang-tidy-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libllvm@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), clang-tools-@LLVM_VERSION@, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming @@ -108,7 +108,7 @@ Package: clangd-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -161,7 +161,7 @@ Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}) + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) Description: Clang library - Development package 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 @@ -174,8 +174,8 @@ Description: Clang library - Development package libclang1-@LLVM_VERSION@. Package: libclang-common-@LLVM_VERSION@-dev -Architecture: all -Multi-Arch: foreign +Architecture: any +Multi-Arch: same Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libclang-rt-@LLVM_VERSION@-dev