r14271 - in packages/trunk/boswars/debian: . patches

[Marc Dequènes]

Author: duck
Date: 2013-06-18 20:51:06 +0000 (Tue, 18 Jun 2013)
New Revision: 14271

Added:
   packages/trunk/boswars/debian/patches/buildsys_flags_fix.patch
Modified:
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/patches/series
   packages/trunk/boswars/debian/rules
Log:
added hardening flags + broken buildsys fix to merge flags correctly

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2013-06-18 18:23:55 UTC (rev 14270)
+++ packages/trunk/boswars/debian/changelog	2013-06-18 20:51:06 UTC (rev 14271)
@@ -6,6 +6,8 @@
     - sdl_disable_mouse_relative_mode
   * Adapted rules as final binary was relocated and renamed.
   * Updated copyright file.
+  * Added hardening build flags, with a buildsys fix to merge flags
+    correctly (buildsys_flags_fix.patch).
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 17 Jun 2013 01:02:23 +0200
 

Added: packages/trunk/boswars/debian/patches/buildsys_flags_fix.patch
===================================================================
--- packages/trunk/boswars/debian/patches/buildsys_flags_fix.patch	                        (rev 0)
+++ packages/trunk/boswars/debian/patches/buildsys_flags_fix.patch	2013-06-18 20:51:06 UTC (rev 14271)
@@ -0,0 +1,35 @@
+--- broken/SConstruct	2013-06-18 22:33:39.635161061 +0200
++++ new/SConstruct	2013-06-18 22:33:25.283258475 +0200
+@@ -101,29 +101,9 @@
+         }
+         static_libs = []
+ 
+-        params = output.split()
+-        for arg in params:
+-            if arg[0] != '-':
+-                static_libs.append(arg)
+-            elif arg[:2] == '-L':
+-                flags['LIBPATH'].append(arg[2:])
+-            elif arg[:2] == '-l':
+-                flags['LIBS'].append(arg[2:])
+-            elif arg[:2] == '-I':
+-                flags['CPPPATH'].append(arg[2:])
+-            elif arg[:4] == '-Wa,':
+-                flags['ASFLAGS'].append(arg)
+-            elif arg[:4] == '-Wl,':
+-                flags['LINKFLAGS'].append(arg)
+-            elif arg[:4] == '-Wp,':
+-                flags['CPPFLAGS'].append(arg)
+-            elif arg == '-pthread':
+-                flags['CCFLAGS'].append(arg)
+-                flags['LINKFLAGS'].append(arg)
+-            else:
+-                flags['CCFLAGS'].append(arg)
+-        apply(env.Append, (), flags)
+-        return static_libs
++	flags = env.ParseFlags(output)
++	env.MergeFlags(flags, unique=0)
++	return flags['LIBS']
+ 
+     if function is None:
+         function = parse_conf

Modified: packages/trunk/boswars/debian/patches/series
===================================================================
--- packages/trunk/boswars/debian/patches/series	2013-06-18 18:23:55 UTC (rev 14270)
+++ packages/trunk/boswars/debian/patches/series	2013-06-18 20:51:06 UTC (rev 14271)
@@ -0,0 +1 @@
+buildsys_flags_fix.patch

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2013-06-18 18:23:55 UTC (rev 14270)
+++ packages/trunk/boswars/debian/rules	2013-06-18 20:51:06 UTC (rev 14271)
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-CCFLAGS=-DSTRATAGUS_LIB_PATH=\\\"/usr/share/games/boswars\\\"
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+export CCFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -DSTRATAGUS_LIB_PATH=\"/usr/share/games/boswars\"
+export LINKFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	scons CCFLAGS=$(CCFLAGS)
+	scons CPPFLAGS='$(CPPFLAGS)' CCFLAGS='$(CCFLAGS)' LINKFLAGS='$(LINKFLAGS)'
 
 override_dh_auto_install: