[beignet] 01/02: Force LLVM/Clang 3.5, as this package will not build with 3.6

[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 2ce258f5547daf1fd7ee2647c7278380000e12b7
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Thu Feb 12 12:15:01 2015 +0000

    Force LLVM/Clang 3.5, as this package will not build with 3.6
---
 debian/changelog                    |  6 +++++
 debian/control                      |  6 ++---
 debian/patches/force-llvm-3.5.patch | 52 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57967a6..966f62d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (1.0.1-2) UNRELEASED; urgency=medium
+
+  * Force LLVM 3.5 to fix FTBFS in Ubuntu.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Thu, 12 Feb 2015 12:13:38 +0000
+
 beignet (1.0.1-1) experimental; urgency=medium
 
   [ Andreas Beckmann ]
diff --git a/debian/control b/debian/control
index 531b0e7..e20c5e4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  cmake,
- clang (>= 1:3.4),
- libclang-dev (>= 1:3.4),
- llvm-dev (>= 1:3.4),
+ clang-3.5,
+ libclang-3.5-dev,
+ llvm-3.5-dev,
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  pkg-config,
diff --git a/debian/patches/force-llvm-3.5.patch b/debian/patches/force-llvm-3.5.patch
new file mode 100644
index 0000000..0169f14
--- /dev/null
+++ b/debian/patches/force-llvm-3.5.patch
@@ -0,0 +1,52 @@
+Description: Explicitly use LLVM/Clang 3.5
+
+The default on Ubuntu is now 3.6, which doesn't work for this package:
+https://launchpad.net/~ginggs/+archive/ubuntu/testing/+build/6971271/+files/buildlog_ubuntu-vivid-amd64.beignet_1.0.1-1%7Eubuntu15.04.1%7Eppa1_FAILEDTOBUILD.txt.gz
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+
+--- beignet-1.0.1.orig/backend/src/libocl/CMakeLists.txt
++++ beignet-1.0.1/backend/src/libocl/CMakeLists.txt
+@@ -136,7 +136,7 @@ MACRO(ADD_CL_TO_BC_TARGET _file)
+     ADD_CUSTOM_COMMAND(OUTPUT ${output_name}
+ 	COMMAND mkdir -p ${OCL_OBJECT_DIR}/
+ 	#COMMAND echo ${LLVM_INSTALL_DIR}clang -cc1 ${CLANG_OCL_FLAGS} -I ${LIBOCL_BINARY_DIR}/include/ -emit-llvm-bc -triple spir -o ${output_name} -x cl ${_file}
+-	COMMAND ${LLVM_INSTALL_DIR}clang -cc1 ${CLANG_OCL_FLAGS} -I ${OCL_OBJECT_DIR}/include/ -emit-llvm-bc -triple spir -o ${output_name} -x cl ${_file}
++	COMMAND ${LLVM_INSTALL_DIR}clang-3.5 -cc1 ${CLANG_OCL_FLAGS} -I ${OCL_OBJECT_DIR}/include/ -emit-llvm-bc -triple spir -o ${output_name} -x cl ${_file}
+ 	DEPENDS ${_file} ${OCL_HEADER_FILES}
+ 	COMMENT "Compiling ${_file}"
+ 	)
+@@ -175,7 +175,7 @@ MACRO(ADD_LL_TO_BC_TARGET M)
+     ADD_CUSTOM_COMMAND(OUTPUT ${output_name}
+ 	COMMAND mkdir -p ${OCL_OBJECT_DIR}/
+ 	#COMMAND echo ${LLVM_INSTALL_DIR}llvm-as -o ${output_name} ${srcll_name}
+-	COMMAND ${LLVM_INSTALL_DIR}llvm-as -o ${output_name} ${srcll_name}
++	COMMAND ${LLVM_INSTALL_DIR}llvm-as-3.5 -o ${output_name} ${srcll_name}
+ 	DEPENDS ${srcll_name}
+ 	COMMENT "Compiling ${srcll_name}"
+ 	)
+@@ -193,21 +193,21 @@ ENDFOREACH(f)
+ ADD_CUSTOM_COMMAND(OUTPUT ${OCL_OBJECT_DIR}/beignet.bc
+     COMMAND mkdir -p ${LIBOCL_BINARY_DIR}/lib/
+     #COMMAND echo llvm-link -o ${LIBOCL_BINARY_DIR}/lib/beignet.bc ${OCL_BC_FILES}
+-    COMMAND ${LLVM_INSTALL_DIR}llvm-link -o ${OCL_OBJECT_DIR}/beignet.bc ${OCL_BC_FILES}
++    COMMAND ${LLVM_INSTALL_DIR}llvm-link-3.5 -o ${OCL_OBJECT_DIR}/beignet.bc ${OCL_BC_FILES}
+     DEPENDS ${OCL_BC_FILES}
+     COMMENT "Generate the bitcode file: ${OCL_OBJECT_DIR}/beignet.bc"
+     )
+ 
+ ADD_CUSTOM_COMMAND(OUTPUT ${OCL_OBJECT_DIR}/beignet.local.pch
+     COMMAND mkdir -p ${OCL_OBJECT_DIR}
+-    COMMAND ${LLVM_INSTALL_DIR}clang -cc1 ${CLANG_OCL_FLAGS} -triple spir -I ${OCL_OBJECT_DIR}/include/ -emit-pch -x cl ${OCL_OBJECT_DIR}/include/ocl.h -o ${OCL_OBJECT_DIR}/beignet.local.pch
++    COMMAND ${LLVM_INSTALL_DIR}clang-3.5 -cc1 ${CLANG_OCL_FLAGS} -triple spir -I ${OCL_OBJECT_DIR}/include/ -emit-pch -x cl ${OCL_OBJECT_DIR}/include/ocl.h -o ${OCL_OBJECT_DIR}/beignet.local.pch
+     DEPENDS ${OCL_HEADER_FILES}
+     COMMENT "Generate the pch file: ${OCL_OBJECT_DIR}/beignet.local.pch"
+     )
+ 
+ ADD_CUSTOM_COMMAND(OUTPUT ${OCL_OBJECT_DIR}/beignet.pch
+     COMMAND mkdir -p ${OCL_OBJECT_DIR}
+-    COMMAND ${LLVM_INSTALL_DIR}clang -cc1 ${CLANG_OCL_FLAGS} -triple spir -I ${OCL_OBJECT_DIR}/include/ --relocatable-pch -emit-pch -isysroot ${LIBOCL_BINARY_DIR} -x cl ${OCL_OBJECT_DIR}/include/ocl.h -o ${OCL_OBJECT_DIR}/beignet.pch
++    COMMAND ${LLVM_INSTALL_DIR}clang-3.5 -cc1 ${CLANG_OCL_FLAGS} -triple spir -I ${OCL_OBJECT_DIR}/include/ --relocatable-pch -emit-pch -isysroot ${LIBOCL_BINARY_DIR} -x cl ${OCL_OBJECT_DIR}/include/ocl.h -o ${OCL_OBJECT_DIR}/beignet.pch
+     DEPENDS ${OCL_HEADER_FILES}
+     COMMENT "Generate the pch file: ${OCL_OBJECT_DIR}/beignet.pch"
+     )
diff --git a/debian/patches/series b/debian/patches/series
index e7a80f3..46a7d6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-compiler_fill_image_1d_array.patch
 fail-gracefully-cl_mem_allocate.patch
 llvm-search-order.patch
 remove-unsafe-define-D__-USER-__.patch
+force-llvm-3.5.patch

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