From fb51d809d7dbbedc7c2e72dfc387d11dcf9a34e6 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 20 Aug 2015 15:51:46 +0000
Subject: [PATCH] Fix cmake issue, update changelog

---
 debian/changelog                            | 10 ++++++++-
 debian/patches/fix-cmake-config-prefix.diff | 25 +++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/fix-cmake-config-prefix.diff

diff --git a/debian/changelog b/debian/changelog
index c3d9d0da..9c67bd1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 llvm-toolchain-snapshot (1:3.8~svn245286-2) UNRELEASED; urgency=medium
 
-  * d/p/bug783205.patch fix s390x porting issue.
+  * Team upload
+  [ Gianfranco Costamagna ]
+  * d/p/bug783205.patch fix s390x porting issue
+    (rebase to trunk).
+
+  [ James Price ]
+  * d/p/fix-cmake-config-prefix.diff: fix cmake path,
+    needs a change after upstream revision r241080
+    (Closes: #794905)
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 18 Aug 2015 18:37:46 +0200
 
diff --git a/debian/patches/fix-cmake-config-prefix.diff b/debian/patches/fix-cmake-config-prefix.diff
new file mode 100644
index 00000000..f9f94748
--- /dev/null
+++ b/debian/patches/fix-cmake-config-prefix.diff
@@ -0,0 +1,25 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+--- a/cmake/modules/Makefile
++++ b/cmake/modules/Makefile
+@@ -62,17 +62,9 @@
+ 
+ LLVM_CONFIG_CODE := \
+ \# Compute the CMake directory from the LLVMConfig.cmake file location.\n\
+-get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n\
+-\# Compute the installation prefix from the LLVMConfig.cmake file location.\n\
+-get_filename_component(LLVM_INSTALL_PREFIX "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n
++get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n
+ 
+-# Compute number of levels (typically 3 - ``share/llvm/cmake/``) to PROJ_prefix
+-# from PROJ_cmake, then emit the appropriate number of calls to
+-# get_filename_components(). Note this assumes there are no spaces in the
+-# cmake_path_suffix variable.
+-cmake_path_suffix := $(subst $(PROJ_prefix),,$(subst $(DESTDIR),,$(PROJ_cmake)))
+-cmake_path_dirs := $(subst /, ,$(cmake_path_suffix))
+-LLVM_CONFIG_CODE += $(foreach __not_used,$(cmake_path_dirs),get_filename_component(LLVM_INSTALL_PREFIX "$${LLVM_INSTALL_PREFIX}" PATH)\n)
++LLVM_CONFIG_CODE += set(LLVM_INSTALL_PREFIX "$(subst /,\/,$(PROJ_prefix))")\n
+ 
+ LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ea89a4c2..4b3f6625 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ clang-analyzer-force-version.diff
 locale-issue-ld.diff
 CVE-2015-2305.patch
 bug783205.patch
+fix-cmake-config-prefix.diff