[Pkg-opencl-devel] beignet: FTBFS - uses versioned llvm commands, but unversioned build dependency

[Rebecca N. Palmer]

Control: tags -1 patch

This occurs because beignet currently expects llvm 3.4 but Depends: on 
the default, which recently changed to 3.5 (#760050); the attached fixes 
it by explicitly using 3.4 everywhere.

(Testing note: Due to linux bug #767148, neither the existing beignet 
nor this version work in current sid without
$ sudo sh -c "echo -n 0 > /sys/module/i915/parameters/enable_cmd_parser"
_Warning_: I do not know whether this workaround is a security risk.)

I tried actually switching to 3.5, but this didn't build, and README.md 
says it would only work if LLVM was compiled with --enable-cxx11, which 
Debian's isn't; I hence suggest staying with 3.4 for Jessie.
-------------- next part --------------
diff -Nru beignet-0.8/debian/control beignet-0.8/debian/control
--- beignet-0.8/debian/control	2014-09-11 16:43:33.000000000 +0100
+++ beignet-0.8/debian/control	2014-10-28 11:56:51.000000000 +0000
@@ -4,9 +4,9 @@
 Build-Depends: debhelper (>= 9), cmake, pkg-config, python-minimal,
  ocl-icd-dev, ocl-icd-opencl-dev,
  libdrm-dev, libxfixes-dev, libxext-dev,
- llvm-dev (>= 1:3.4),
- clang (>= 1:3.4),
- libclang-dev (>= 1:3.4),
+ llvm-3.4-dev,
+ clang-3.4,
+ libclang-3.4-dev,
  libgl1-mesa-dev (>= 9) [!kfreebsd-any],
  libegl1-mesa-dev (>= 9) [!kfreebsd-any],
  libgbm-dev (>= 9) [!kfreebsd-any],
diff -Nru beignet-0.8/debian/patches/versioned-llvm-tools beignet-0.8/debian/patches/versioned-llvm-tools
--- beignet-0.8/debian/patches/versioned-llvm-tools	2014-04-19 18:54:55.000000000 +0100
+++ beignet-0.8/debian/patches/versioned-llvm-tools	2014-10-28 12:17:01.000000000 +0000
@@ -1,9 +1,20 @@
 Description: Use versioned LLVM tools
-Author: Simon Richter <sjr at debian.org>
-Last-Update: 2014-04-19
+Description: <short summary of the patch>
+Author: Simon Richter <sjr at debian.org>, Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/759933,https://bugs.debian.org/764930
 
 --- beignet-0.8.orig/backend/src/CMakeLists.txt
 +++ beignet-0.8/backend/src/CMakeLists.txt
+@@ -58,8 +58,8 @@ set (clang_cmd ${clang_cmd} -fno-builtin
+ add_custom_command(
+      OUTPUT ${pch_object}
+      COMMAND rm -f ${pch_object}
+-     COMMAND clang ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object}
+-     COMMAND clang ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object}
++     COMMAND clang-3.4 ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object}
++     COMMAND clang-3.4 ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object}
+      DEPENDS ${ocl_blob_file}
+      )
+ 
 @@ -71,14 +71,14 @@ macro(ll_add_library ll_lib ll_sources)
    add_custom_command(
         OUTPUT  ${ll}.bc