[beignet] 06/13: Switch to LLVM/Clang 3.7 to match mesa

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit ad503776c732f00f317b7dc1f59c1d6e60ad86b3
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sun Apr 24 17:11:39 2016 +0100

    Switch to LLVM/Clang 3.7 to match mesa
    
    It has been reported that ICDs using different versions crash when
    used together, though I haven't seen this myself:
    https://lists.alioth.debian.org/pipermail/pkg-opencl-devel/Week-of-Mon-20160418/000963.html
---
 debian/changelog                 |  1 +
 debian/control                   |  6 +++---
 debian/patches/find-llvm37.patch | 22 ++++++++++++++++++++++
 debian/patches/series            |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3edfcd7..a79e8d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ beignet (1.1.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop patches applied upstream, refresh others.
   * Drop find-python35.patch: this has now been fixed in cmake.
+  * Switch to LLVM/Clang 3.7 to match mesa.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 24 Apr 2016 15:31:25 +0100
 
diff --git a/debian/control b/debian/control
index 43d2933..b26082a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  cmake (>= 2.8.5),
- clang (>= 1:3.5~), clang (<< 1:3.8~),
- libclang-dev,
- llvm-dev,
+ clang-3.7,
+ libclang-3.7-dev,
+ llvm-3.7-dev,
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  pkg-config,
diff --git a/debian/patches/find-llvm37.patch b/debian/patches/find-llvm37.patch
new file mode 100644
index 0000000..2986861
--- /dev/null
+++ b/debian/patches/find-llvm37.patch
@@ -0,0 +1,22 @@
+Description: Accept LLVM/Clang 3.7
+
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Forwarded: not yet
+
+--- beignet-1.1.2.orig/CMake/FindLLVM.cmake
++++ beignet-1.1.2/CMake/FindLLVM.cmake
+@@ -8,12 +8,12 @@
+ # LLVM_FOUND       - True if llvm found.
+ if (LLVM_INSTALL_DIR)
+   find_program(LLVM_CONFIG_EXECUTABLE
+-               NAMES llvm-config-35 llvm-config-3.5 llvm-config-36 llvm-config-3.6 llvm-config-33 llvm-config-3.3 llvm-config-34 llvm-config-3.4 llvm-config
++               NAMES llvm-config-35 llvm-config-3.5 llvm-config-36 llvm-config-3.6 llvm-config-37 llvm-config-3.7 llvm-config-33 llvm-config-3.3 llvm-config-34 llvm-config-3.4 llvm-config
+                DOC "llvm-config executable"
+                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
+ else (LLVM_INSTALL_DIR)
+   find_program(LLVM_CONFIG_EXECUTABLE
+-               NAMES llvm-config-35 llvm-config-3.5 llvm-config-36 llvm-config-3.6 llvm-config-33 llvm-config-3.3 llvm-config-34 llvm-config-3.4 llvm-config
++               NAMES llvm-config-35 llvm-config-3.5 llvm-config-36 llvm-config-3.6 llvm-config-37 llvm-config-3.7 llvm-config-33 llvm-config-3.3 llvm-config-34 llvm-config-3.4 llvm-config
+                DOC "llvm-config executable")
+ endif (LLVM_INSTALL_DIR)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 95e8b54..041aa39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ shared-llvm.patch
 update-docs.patch
 allow-+-in-directory.patch
 printf-fix-90472.patch
+find-llvm37.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git