From 2dab488e22b9b5bcfea5e176b3e34fe4c687a746 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 31 Aug 2021 20:31:04 +0200 Subject: [PATCH] Fix changelog --- debian/changelog | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index af63e03d..ca5841fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,11 @@ llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium -<<<<<<< - * cmake: use ON instead of YES for consistency * Add debian/source/options to ignore the diff (much much faster to repack) - * Add LIBCXXABI_ENABLE_STATIC_UNWINDER=ON - LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF - LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON - to libc++ when libunwind is built - Matches what is done on brew: - https://bit.ly/3kDNpC9 [ Gianfranco Costamagna ] * Add a patch to fix omp build on riscv64 - * cmake: use ON instead of YES for consistency - * Add LIBCXXABI_ENABLE_STATIC_UNWINDER=ON - LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF - LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON - to libc++ when libunwind is built - Matches what is done on brew: - https://bit.ly/3kDNpC9 - [ Gianfranco Costamagna ] - * Add a patch to fix omp build on riscv64 -======= + [ Sylvestre Ledru ] * cmake: use ON instead of YES for consistency * Add LIBCXXABI_ENABLE_STATIC_UNWINDER=ON LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF @@ -33,10 +16,6 @@ llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium * Don't generate the llvm-mcmarkup & lldb-mi manpages (don't exist anymore) (LP: #1940713) - [ Gianfranco Costamagna ] - * Add a patch to fix omp build on riscv64 ->>>>>>> - -- Sylvestre Ledru Sun, 29 Aug 2021 15:15:18 +0200 llvm-toolchain-12 (1:12.0.1-6) unstable; urgency=medium