[beignet] 05/07: Switch to LLVM 3.8 on x32 and kfreebsd-i386 (it still isn't available on kfreebsd-amd64)

[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 56b7a353d208b2922a7b00f5faaac8256425296e
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Mon Sep 5 20:20:49 2016 +0100

    Switch to LLVM 3.8 on x32 and kfreebsd-i386
    (it still isn't available on kfreebsd-amd64)
---
 debian/changelog |  1 +
 debian/control   | 12 ++++++------
 debian/rules     |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 465bdd3..a06af26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ beignet (1.2.0-1) UNRELEASED; urgency=medium
   * Drop patches applied upstream, refresh others.
   * Move cl_intel_accelerator to cl_intel.h to fix FTBFS with
     system cl_ext.h.
+  * Switch to LLVM 3.8 also on x32 and kfreebsd-i386.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 04 Sep 2016 20:53:34 +0100
 
diff --git a/debian/control b/debian/control
index e12f85f..782a5c2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,12 +11,12 @@ Build-Depends:
  cmake (>= 2.8.5),
 # We use the same LLVM version as mesa (see debian/rules)
  libgl1-mesa-dri,
- clang-3.7 [kfreebsd-any],
- libclang-3.7-dev [kfreebsd-any],
- llvm-3.7-dev [kfreebsd-any],
- clang-3.8 [!kfreebsd-any],
- libclang-3.8-dev [!kfreebsd-any],
- llvm-3.8-dev [!kfreebsd-any],
+ clang-3.7 [kfreebsd-amd64],
+ libclang-3.7-dev [kfreebsd-amd64],
+ llvm-3.7-dev [kfreebsd-amd64],
+ clang-3.8 [!kfreebsd-amd64],
+ libclang-3.8-dev [!kfreebsd-amd64],
+ llvm-3.8-dev [!kfreebsd-amd64],
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  pkg-config,
diff --git a/debian/rules b/debian/rules
index 4679137..c8a6bb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ SUPERFLUOUS=cl.h cl_d3d10.h cl_dx9_media_sharing.h cl_ext.h cl_gl_ext.h cl_platf
 # Use the same LLVM version as mesa (build will fail if this version is not available; this is intentional, as mixing versions may cause crashes)
 # http://lists.alioth.debian.org/pipermail/pkg-opencl-devel/Week-of-Mon-20160418/000963.html
 LLVM_VERSION_MESA	:= $(shell dpkg-query -f '$${Depends} \n' -W libgl1-mesa-dri:$(DEB_HOST_ARCH) | sed -r 's/.*libllvm([0-9.]+).*/\1/p;d')
-LLVM_VERSION_DEFAULT	 = 3.7
+LLVM_VERSION_DEFAULT	 = 3.8
 LLVM_VERSION		 = $(or $(LLVM_VERSION_MESA),$(LLVM_VERSION_DEFAULT))
 
 override_dh_auto_configure:

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