From 6687fb05272b57d1319b8e96c79c9432a20fcece Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 11 Dec 2023 10:35:09 +0100 Subject: [PATCH] * New snapshot release * Fix a libc++ conflicts (Closes: #1057899) --- debian/changelog | 8 ++++++-- debian/control | 14 ++------------ debian/control.in | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb8d245f..6a1b0682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp1) experimental; urgency=medium [ Matthias Klose ] * Set the cpu defaults for the ARM32 architectures: @@ -8,7 +8,11 @@ llvm-toolchain-snapshot (1:18~++20231203101651+e3b3c91dd0bb-1~exp2) UNRELEASED; * Apply the proposed fix for D158491, build failure on mips64el, still unreviewed upstream. Addresses: #1056116. - -- Sylvestre Ledru Tue, 05 Dec 2023 07:43:43 +0100 + [ Sylvestre Ledru ] + * New snapshot release + * Fix a libc++ conflicts (Closes: #1057899) + + -- Sylvestre Ledru Mon, 11 Dec 2023 10:26:59 +0100 llvm-toolchain-snapshot (1:18~++20231203063627+9f78edbd20ed-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 58a559b6..51299311 100644 --- a/debian/control +++ b/debian/control @@ -186,8 +186,6 @@ Package: libclang-rt-18-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Compiler-rt - development package This package provides various libraries: @@ -204,10 +202,7 @@ Package: libclang-rt-18-dev-wasm32 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm32 builtins Provides the compiler-rt builtins for WebAssembly 32 bits @@ -215,10 +210,7 @@ Package: libclang-rt-18-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits @@ -228,8 +220,6 @@ Package: libpolly-18-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-18-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: High-level loop and data-locality optimizer Uses an abstract mathematical representation based on integer polyhedra @@ -688,10 +678,10 @@ Architecture: any Multi-Arch: same Depends: libc++1-18 (= ${binary:Version}), ${misc:Depends}, libunwind-18-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Breaks: libc++-dev (<< 44), libc++abi-18-dev (<< 1:18~++20231211102647+75193b192ad9-1) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Replaces: libc++-x.y-dev, libc++abi-18-dev (<< 1:18~++20231211102647+75193b192ad9-1) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . diff --git a/debian/control.in b/debian/control.in index f20e3561..c31e40af 100644 --- a/debian/control.in +++ b/debian/control.in @@ -678,10 +678,10 @@ Architecture: any Multi-Arch: same Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231211102647+75193b192ad9-1) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231203101651+e3b3c91dd0bb-1) +Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:18~++20231211102647+75193b192ad9-1) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library .