From bd33ffecedd34ea248a3b099b7f27580f3afd3de Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 9 May 2016 05:32:59 +0000
Subject: [PATCH] * Install cmake files in usr/share/llvm-@LLVM_VERSION@/cmake/
 instead of   usr/share/llvm-@LLVM_VERSION@/cmake/ * Also install
 libLLVM-3.8.so.1 as a symlink * debian/patches/fix-cmake-config-prefix.diff: 
  cover the CMake build system too (Closes: #819072)

---
 debian/changelog                            | 12 ++++++++++++
 debian/llvm-X.Y-dev.install.in              |  3 +--
 debian/llvm-X.Y-dev.links.in                |  1 +
 debian/patches/fix-cmake-config-prefix.diff | 21 +++++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d08d9f46..20a923a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+llvm-toolchain-3.8 (1:3.8.1-2) unstable; urgency=medium
+
+  [ Brad King ]
+  * Install cmake files in usr/share/llvm-@LLVM_VERSION@/cmake/ instead of
+    usr/share/llvm-@LLVM_VERSION@/cmake/
+  * Also install libLLVM-3.8.so.1 as a symlink
+  * debian/patches/fix-cmake-config-prefix.diff:
+    cover the CMake build system too
+  (Closes: #819072)
+
+ --
+
 llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium
 
   * Preparation of 3.8.1
diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in
index 85f07ac5..d532f967 100644
--- a/debian/llvm-X.Y-dev.install.in
+++ b/debian/llvm-X.Y-dev.install.in
@@ -9,8 +9,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so
 usr/lib/llvm-@LLVM_VERSION@/include/llvm/      usr/include/llvm-@LLVM_VERSION@/
 usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/	usr/include/llvm-c-@LLVM_VERSION@/
 # Explicit debian/tmp since there are multiple declarations
-debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/
-
+debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake
 
 utils/vim/indent/llvm-@LLVM_VERSION@.vim		        usr/share/vim/addons/indent/
 
diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in
index 622d436d..00d8187b 100644
--- a/debian/llvm-X.Y-dev.links.in
+++ b/debian/llvm-X.Y-dev.links.in
@@ -1,4 +1,5 @@
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1       usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1
diff --git a/debian/patches/fix-cmake-config-prefix.diff b/debian/patches/fix-cmake-config-prefix.diff
index f9f94748..fd1d44ac 100644
--- a/debian/patches/fix-cmake-config-prefix.diff
+++ b/debian/patches/fix-cmake-config-prefix.diff
@@ -23,3 +23,24 @@
  
  LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib")
  
+--- a/cmake/modules/CMakeLists.txt
++++ b/cmake/modules/CMakeLists.txt
+@@ -47,16 +47,7 @@ file(COPY .
+   )
+ 
+ # Generate LLVMConfig.cmake for the install tree.
+-set(LLVM_CONFIG_CODE "
+-# Compute the installation prefix from this LLVMConfig.cmake file location.
+-get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
+-# Construct the proper number of get_filename_component(... PATH)
+-# calls to compute the installation prefix.
+-string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}")
+-foreach(p ${_count})
+-  set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}
+-get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")
+-endforeach(p)
++set(LLVM_CONFIG_CODE "set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")
+ set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include")
+ set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}")
+ set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
+