[Pkg-opencl-devel] [beignet] 41/47: fix FTBFS of ~dfsg versions in pbuilder

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository beignet.

commit cb3ccbe142f4019b9f44f9bf1c4e9f89c824b3de
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Oct 31 22:01:32 2014 +0100

    fix FTBFS of ~dfsg versions in pbuilder
---
 debian/changelog                                   |  2 ++
 ...set-environment-variables-for-GBE_BIN_GEN.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7096a97..ed47848 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ beignet (0.9.3~dfsg-1) UNRELEASED; urgency=medium
   * Repack upstream tarball to remove non-distributable Len(n)a images and
     CC-BY-NC-SA licensed parts from the test suite.  (Closes: #767387)
   * 0001-fix-some-typos.patch: New.
+  * 0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch: New, fix
+    FTBFS of "~dfsg" versions in pbuilder etc.
 
  -- Andreas Beckmann <anbe at debian.org>  Fri, 31 Oct 2014 21:22:59 +0100
 
diff --git a/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch b/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
new file mode 100644
index 0000000..b5110c3
--- /dev/null
+++ b/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
@@ -0,0 +1,33 @@
+From dd8a10b17d567274ea7a8ea0771ad2044aff682e Mon Sep 17 00:00:00 2001
+From: Andreas Beckmann <anbe at debian.org>
+Date: Fri, 31 Oct 2014 21:45:58 +0100
+Subject: [PATCH] use env to set environment variables for
+ GBE_BIN_GENERATER
+
+cmake interprets OCL_PCM_PATH=... as a command and will enclose it in
+quotes in case it contains characters requiring protection, e.g. ~
+a quoted "FOO=bar" is interpreted by /bin/sh as a command (that does not
+exist), not a variable setting for a following command
+
+use env to set the variables unambiguously
+
+Signed-off-by: Andreas Beckmann <anbe at debian.org>
+---
+ 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
+--- 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)
+ 
+ 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
+      PARENT_SCOPE)
+ 
+-- 
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index cf18607..781d8c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Utest-requires-deprecated-function-names.patch
 Link-against-terminfo.patch
 Fix-build-failure.patch
 0001-fix-some-typos.patch
+0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch

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