r15155 - in packages/trunk/pingus/debian: . patches

[Bertrand Marc]

Author: bbk-guest
Date: 2014-08-10 12:55:31 +0000 (Sun, 10 Aug 2014)
New Revision: 15155

Added:
   packages/trunk/pingus/debian/patches/multiple_buildflags.diff
Modified:
   packages/trunk/pingus/debian/changelog
   packages/trunk/pingus/debian/patches/series
   packages/trunk/pingus/debian/rules
Log:
Really pass build flags to scons and add a patch to allow multiple buildflags in CXXFLAGS.


Modified: packages/trunk/pingus/debian/changelog
===================================================================
--- packages/trunk/pingus/debian/changelog	2014-08-09 14:38:56 UTC (rev 15154)
+++ packages/trunk/pingus/debian/changelog	2014-08-10 12:55:31 UTC (rev 15155)
@@ -7,6 +7,8 @@
   * Update the german translation, thanks to Helge Kreutzmann (Closes: #722887).
   * Update standards version to 3.9.5: no changes needed.
   * Enable hardening build flags in debian/rules.
+  * Add debian/patches/mutliple_buildflags.diff to allow multiple buildflags to
+    be passed to scons.
   * Remove options.cache and its logic in debian/rules as scons doesn't use it.
 
   [ Evgeni Golov ]

Added: packages/trunk/pingus/debian/patches/multiple_buildflags.diff
===================================================================
--- packages/trunk/pingus/debian/patches/multiple_buildflags.diff	                        (rev 0)
+++ packages/trunk/pingus/debian/patches/multiple_buildflags.diff	2014-08-10 12:55:31 UTC (rev 15155)
@@ -0,0 +1,17 @@
+Description: Convert CXXFLAGS to CLVar to accept multiple buildflags.
+ Scons did not accept multiple CXXFLAGS because list and strings do not mix well.
+ Using a CLVar instead fixes this.
+Author: Bertrand Marc <beberking at gmail.com>
+Forwarded: yes
+Last-Update: 2014-08-10
+--- a/SConscript
++++ b/SConscript
+@@ -97,7 +97,7 @@
+         self.opts.Add('CPPDEFINES', 'defined constants', [])
+         self.opts.Add('LIBS',       'Additional libraries', [])
+         self.opts.Add('CCFLAGS',    'C Compiler flags', [])
+-        self.opts.Add('CXXFLAGS',   'C++ Compiler flags', ["-O2", "-s"])
++        self.opts.Add('CXXFLAGS',   'C++ Compiler flags', ["-O2", "-s"], converter=SCons.Util.CLVar)
+         self.opts.Add('LINKFLAGS',  'Linker Compiler flags', [])
+ 
+         self.opts.Add(BoolVariable('with_opengl',        'Build with OpenGL support', True))

Modified: packages/trunk/pingus/debian/patches/series
===================================================================
--- packages/trunk/pingus/debian/patches/series	2014-08-09 14:38:56 UTC (rev 15154)
+++ packages/trunk/pingus/debian/patches/series	2014-08-10 12:55:31 UTC (rev 15155)
@@ -1,2 +1,3 @@
 update_german_translation.patch
 20_gcc_4.7
+multiple_buildflags.diff

Modified: packages/trunk/pingus/debian/rules
===================================================================
--- packages/trunk/pingus/debian/rules	2014-08-09 14:38:56 UTC (rev 15154)
+++ packages/trunk/pingus/debian/rules	2014-08-10 12:55:31 UTC (rev 15155)
@@ -21,7 +21,8 @@
 build-indep: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	scons $(SCONS_OPTS)
+	scons $(SCONS_OPTS) CPPFLAGS='$(CPPFLAGS)' CXXFLAGS='$(CXXFLAGS)' \
+		LINKFLAGS='$(LDFLAGS)'
 	touch $@
 
 clean: clean-patched
@@ -32,7 +33,8 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	scons -c
+	scons -c CPPFLAGS='$(CPPFLAGS)' CXXFLAGS='$(CXXFLAGS)' \
+		LINKFLAGS='$(LDFLAGS)'
 	rm -f build-stamp configure-stamp
 	rm -f config.log .sconsign.dblite
 	rm -rf .sconf_temp build/