From 13740e79aec737be5cfb5e7281da06a50d066afb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 30 Jul 2021 14:49:34 +0200 Subject: [PATCH] Fix changelog --- debian/changelog | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38594715..dc8e5a8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium -<<<<<<< * Generate libunwind-12 & libunwind-12-dev packages * Add the following option to the libc++ build: -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON @@ -40,28 +39,6 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium [ Jordan Justen ] * d/rules: Adjust cmake defines to fix libclc.pc paths -======= - * Add the following option to the libc++ build: - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON - -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON - -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF - to address upstream bug 46321 - * Build libunwind - * Make libc++abi use libunwind - - [ Kasper Kantz ] - * Add riscv64 architecture in control - enable liblldb, libomp and others which are - currently unavailable in riscv64 repository. - - [ Krzysztof Aleksander Pyrkosz ] - * Add libxml2 as a dependency as it is necessary - for llvm manifest tool (llvm-mt) - (Closes: #990537) - - [ Jordan Justen ] - * d/rules: Adjust cmake defines to fix libclc.pc paths ->>>>>>> -- Sylvestre Ledru Mon, 12 Jul 2021 08:19:59 +0200