[xboxdrv] 77/78: Fix handling *FLAGS environment variables containing >1 flags

[Andrey Rahmatullin]

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

wrar-guest pushed a commit to branch master
in repository xboxdrv.

commit 4877341b2ab83c69ace366775ca6f31830fc2652
Author: Andrey Rahmatullin <wrar at wrar.name>
Date:   Sun Feb 21 14:09:50 2016 +0500

    Fix handling *FLAGS environment variables containing >1 flags
---
 debian/patches/fix-build-flags-parsing.patch | 36 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/fix-build-flags-parsing.patch b/debian/patches/fix-build-flags-parsing.patch
new file mode 100644
index 0000000..e012722
--- /dev/null
+++ b/debian/patches/fix-build-flags-parsing.patch
@@ -0,0 +1,36 @@
+Description: Fix handling *FLAGS environment variables containing >1 flags
+Author: Andrey Rahmatullin <wrar at wrar.name>
+Forwarded: no
+Last-Update: 2016-02-13
+
+diff --git a/SConstruct b/SConstruct
+index 4cd7970..04e7e62 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -4,6 +4,8 @@ import os
+ import subprocess
+ import string
+ import re
++
++import SCons
+ 

+ def build_dbus_glue(target, source, env):
+     """
+@@ -76,13 +78,13 @@ env = Environment(ENV=os.environ, BUILDERS = {
+ opts = Variables(['custom.py'], ARGUMENTS)
+ 
+ opts.Add('CPPPATH', 'Additional preprocessor paths')
+-opts.Add('CPPFLAGS', 'Additional preprocessor flags')
++opts.Add('CPPFLAGS', 'Additional preprocessor flags', converter=SCons.Util.CLVar)
+ opts.Add('CPPDEFINES', 'defined constants')
+ opts.Add('LIBPATH', 'Additional library paths')
+ opts.Add('LIBS', 'Additional libraries')
+-opts.Add('CCFLAGS', 'C Compiler flags')
+-opts.Add('CXXFLAGS', 'C++ Compiler flags')
+-opts.Add('LINKFLAGS', 'Linker Compiler flags')
++opts.Add('CCFLAGS', 'C Compiler flags', converter=SCons.Util.CLVar)
++opts.Add('CXXFLAGS', 'C++ Compiler flags', converter=SCons.Util.CLVar)
++opts.Add('LINKFLAGS', 'Linker Compiler flags', converter=SCons.Util.CLVar)
+ opts.Add('AR', 'Library archiver')
+ opts.Add('CC', 'C Compiler')
+ opts.Add('CXX', 'C++ Compiler')
diff --git a/debian/patches/series b/debian/patches/series
index 32c23c9..cf8f694 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-xboxdrv-manpage.patch
+fix-build-flags-parsing.patch

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