[beignet] 07/09: adjust patch for 0.8

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch jessie
in repository beignet.

commit a78a03975e8792b526bdcb13e862828523230307
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Nov 17 13:46:00 2014 +0100

    adjust patch for 0.8
---
 debian/changelog                                        |  1 +
 ...v-to-set-environment-variables-for-GBE_BIN_GEN.patch | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e01284..115dbb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ beignet (0.9.3~really.0.8+dfsg-1) UNRELEASED; urgency=medium
     CC-BY-NC-SA licensed parts from the test suite.  (Closes: #767387)
   * 0001-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch: New, fix
     FTBFS of "~dfsg" versions in pbuilder etc.
+    - Backport patch to 0.8.
 
   [ Rebecca N. Palmer ]
   * Build-Depends: clang-3.4, lib{clang,llvm}-3.4-dev.  (Closes: #764930)
diff --git a/debian/patches/0001-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch b/debian/patches/0001-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
index 9ac8fa9..c62d0ae 100644
--- a/debian/patches/0001-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
+++ b/debian/patches/0001-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
@@ -16,18 +16,15 @@ Reviewed-by: Zhigang Gong <zhigang.gong at intel.com>
  backend/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
-index 6a31c68..f68ffc5 100644
+backported to 0.8
+
 --- a/backend/CMakeLists.txt
 +++ b/backend/CMakeLists.txt
-@@ -103,6 +103,6 @@ set(LOCAL_GBE_OBJECT_DIR ${LOCAL_GBE_OBJECT_DIR} PARENT_SCOPE)
- set(LOCAL_INTERP_OBJECT_DIR ${LOCAL_INTERP_OBJECT_DIR} PARENT_SCOPE)
- 
+@@ -100,6 +100,6 @@ add_subdirectory (src)
+ set(LOCAL_PCH_OBJECT_DIR ${LOCAL_PCH_OBJECT_DIR} PARENT_SCOPE)
+ set(LOCAL_PCM_OBJECT_DIR ${LOCAL_PCM_OBJECT_DIR} PARENT_SCOPE)
  set (GBE_BIN_GENERATER
--     OCL_PCM_PATH=${LOCAL_PCM_OBJECT_DIR} OCL_PCH_PATH=${LOCAL_PCH_OBJECT_DIR} LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater
-+     env OCL_PCM_PATH=${LOCAL_PCM_OBJECT_DIR} OCL_PCH_PATH=${LOCAL_PCH_OBJECT_DIR} LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater
+-     OCL_PCM_PATH=${LOCAL_PCM_OBJECT_DIR} OCL_PCH_PATH=${LOCAL_PCH_OBJECT_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater
++     env OCL_PCM_PATH=${LOCAL_PCM_OBJECT_DIR} OCL_PCH_PATH=${LOCAL_PCH_OBJECT_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater
       PARENT_SCOPE)
  
--- 
-2.1.3
-

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