From d46c88e66a999ef2f4311b40052cba4ac2c45c8f Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sun, 18 Apr 2021 23:07:14 +0200
Subject: [PATCH] * Disable again LTO * Create a new package
 llvm-12-linker-tools:   Contains the LLVMgold and LLVMPolly linker plugins.

---
 debian/changelog |  3 +++
 debian/control   | 22 ++++++++++++++++++++++
 debian/rules     | 10 ----------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f2347dc..fc134b96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,9 @@ llvm-toolchain-12 (1:12.0.0-3) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Improve the clean rule
+  * Disable again LTO
+  * Create a new package llvm-12-linker-tools:
+    Contains the LLVMgold and LLVMPolly linker plugins.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 15 Apr 2021 13:27:57 +0200
 
diff --git a/debian/control b/debian/control
index 180491a6..fdb038fa 100644
--- a/debian/control
+++ b/debian/control
@@ -281,6 +281,7 @@ Description: Modular compiler and toolchain technologies, runtime library
  .
  This package contains the LLVM runtime library.
 
+<<<<<<< HEAD
 Package: llvm-13-linker-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -300,6 +301,27 @@ Depends: llvm-13-runtime (= ${binary:Version}),
  llvm-13-linker-tools (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Recommends: llvm-13-dev
+=======
+Package: llvm-12-linker-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: llvm-12-dev (<< 1:12.0.0~++rc5-1ubuntu2), clang-12 (<< 1:12.0.0~++rc5-1ubuntu2)
+Replaces: llvm-12-dev (<< 1:12.0.0~++rc5-1ubuntu2), clang-12 (<< 1:12.0.0~++rc5-1ubuntu2)
+Description: Modular compiler and toolchain technologies
+ LLVM is a collection of libraries and tools that make it easy to build
+ compilers, optimizers, just-in-time code generators, and many other
+ compiler-related programs.
+ .
+ This package contains the LLVMgold and LLVMPolly linker plugins.
+
+Package: llvm-12
+Architecture: any
+Suggests: llvm-12-doc
+Depends: llvm-12-runtime (= ${binary:Version}),
+ llvm-12-linker-tools (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends: llvm-12-dev
+>>>>>>> 608f891a (* Disable again LTO)
 Description: Modular compiler and toolchain technologies
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
diff --git a/debian/rules b/debian/rules
index 9b0657d6..44852e4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -351,16 +351,6 @@ preconfigure:
 		debian/llvm-$(LLVM_VERSION)-dev.install \
 		debian/llvm-$(LLVM_VERSION)-linker-tools.install
 
-
-	# workaround the breaks/replaces/conflicts introduced with llvm-12-linker-tools
-	# we update the version to make it work with apt.llvm.org
-	# Yeah, this is ugly but I don't know how to do better
-	if test "$(LLVM_VERSION)" = "12"; then \
-		if echo "$(LLVM_VERSION_SNAPSHOT)"|grep -q "++"; then \
-			sed -i -e "s|(<< 1:12.0.0-2)|(<< 12.0.0~++20210418)|g" debian/control; \
-		fi; \
-	fi
-
 	# DH doesn't support the [power ...] in install on Ubuntu trusty
 	# fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory
 	if test "$(DISTRO)" = "trusty"; then \