[beignet] 01/01: Automatically match mesa's LLVM version

[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 f45c0677e9b3ad1ed81f16b2bc28b87392438089
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Apr 30 21:14:15 2016 +0100

    Automatically match mesa's LLVM version
    
    (Lets us use the same package for Debian and Ubuntu)
---
 debian/changelog      | 6 +++---
 debian/control        | 6 ++++++
 debian/patches/series | 1 -
 debian/rules          | 9 ++++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d118574..384fc8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-beignet (1.1.2-1) UNRELEASED; urgency=medium
+beignet (1.1.2-1) unstable; 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.
+  * Use same LLVM/Clang version as mesa.
   * Use https in Vcs-Git and Homepage.
   * Bump Standards-Version to 3.9.8 (no changes needed).
   * Enable bindnow hardening.
@@ -14,7 +14,7 @@ beignet (1.1.2-1) UNRELEASED; urgency=medium
   * Use std::isnan/isinf to fix Ubuntu FTBFS.
   * Add LLVM 3.8 support.
 
- -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Mon, 25 Apr 2016 22:37:04 +0100
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sat, 30 Apr 2016 21:13:09 +0100
 
 beignet (1.1.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c351531..7ac7b7a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,15 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  cmake (>= 2.8.5),
+# We use the same LLVM version as mesa (currently 3.7 in Debian,
+# 3.8 in Ubuntu); to avoid needing separate packages, build-depend
+# on both and choose in debian/rules
  clang-3.7,
  libclang-3.7-dev,
  llvm-3.7-dev,
+ clang-3.8,
+ libclang-3.8-dev,
+ llvm-3.8-dev,
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  pkg-config,
diff --git a/debian/patches/series b/debian/patches/series
index 3b11f9d..8b002f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ shared-llvm.patch
 update-docs.patch
 allow-+-in-directory.patch
 printf-fix-90472.patch
-find-llvm37.patch
 std-isnan-isinf.patch
 Enable-test-debug.patch
 llvm38-support.patch
diff --git a/debian/rules b/debian/rules
index 2c48baa..ce0b3ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,16 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DGBE_DEBUG=1
 	dh $@ --buildsystem cmake --parallel
 
 SUPERFLUOUS=cl.h cl_d3d10.h cl_dx9_media_sharing.h cl_ext.h cl_gl_ext.h cl_platform.h cl.hpp cl_d3d11.h cl_egl.h cl_gl.h opencl.h
+# 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:=$(shell apt-cache depends libgl1-mesa-dri | grep -o -e "Depends: libllvm[0-9.]*" | grep -o -e "[0-9.]*")
+ifeq (${LLVM_VERSION},)# mesa not using LLVM at all on this architecture
+LLVM_VERSION:=3.7
+endif
 override_dh_auto_configure:
 	$(RM) $(patsubst %,include/CL/%,$(SUPERFLUOUS))
-	dh_auto_configure --buildsystem cmake
+	dh_auto_configure --buildsystem cmake -- -DLLVM_INSTALL_DIR=/usr/lib/llvm-${LLVM_VERSION}/bin/
 
 override_dh_strip:
 	dh_strip --dbg-package=beignet-opencl-icd-dbg

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