[beignet] 02/02: Use LLVM 3.8 on x32 to fix FTBFS

[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 4f94f958c96d94a0535548a3e989a2d4c67f7540
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Apr 29 12:11:25 2017 +0100

    Use LLVM 3.8 on x32 to fix FTBFS
---
 debian/changelog | 1 +
 debian/rules     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c84d542..4e176ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 beignet (1.3.0-3) UNRELEASED; urgency=medium
 
   * Fix "Exec...-5" error on older hardware.  (Closes: #860805)
+  * Use LLVM 3.8 on x32 to fix FTBFS.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sat, 29 Apr 2017 09:18:39 +0100
 
diff --git a/debian/rules b/debian/rules
index 302dd30..9bc87e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,8 @@ 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.9
+#x32 mesa doesn't use libllvm - use 3.8 there, as their "3.9" snapshot doesn't work for us https://buildd.debian.org/status/fetch.php?pkg=beignet&arch=x32&ver=1.3.0-2&stamp=1489907158&raw=0
+LLVM_VERSION_DEFAULT	 = 3.8
 LLVM_VERSION		 = $(or $(LLVM_VERSION_MESA),$(LLVM_VERSION_DEFAULT))
 #this looks the wrong way round because --compare-versions uses success=0 and we need on=1
 CAN_ENABLE_OPENCL2	:= $(if $(findstring amd64,$(DEB_HOST_ARCH)),$(shell dpkg --compare-versions $(LLVM_VERSION) lt 3.9 || dpkg --compare-versions `dpkg-query -f '$${Version}' -W libdrm-dev:$(DEB_HOST_ARCH)` lt 2.4.66 ; echo $$?),0)

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