r11009 - in packages/trunk/teeworlds/debian: . patches

[Felix Geyer]

Author: debfx-guest
Date: 2010-05-31 23:36:05 +0000 (Mon, 31 May 2010)
New Revision: 11009

Added:
   packages/trunk/teeworlds/debian/patches/pass-build-flags.patch
Modified:
   packages/trunk/teeworlds/debian/changelog
   packages/trunk/teeworlds/debian/patches/series
   packages/trunk/teeworlds/debian/rules
Log:
Add pass-build-flags.patch to pass CFLAGS and LDFLAGS to the build system.


Modified: packages/trunk/teeworlds/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog	2010-05-31 22:25:10 UTC (rev 11008)
+++ packages/trunk/teeworlds/debian/changelog	2010-05-31 23:36:05 UTC (rev 11009)
@@ -10,8 +10,9 @@
   * Bump Standards-Version to 3.8.4, no changes needed.
   * Switch to dh7 rules and source format 3.0 (quilt).
   * Bump debian/compat to 7.
+  * Add pass-build-flags.patch to pass CFLAGS and LDFLAGS to the build system.
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 01 Jun 2010 00:03:16 +0200
+ -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 01 Jun 2010 01:12:46 +0200
 
 teeworlds (0.5.1-4) unstable; urgency=low
 

Added: packages/trunk/teeworlds/debian/patches/pass-build-flags.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/pass-build-flags.patch	                        (rev 0)
+++ packages/trunk/teeworlds/debian/patches/pass-build-flags.patch	2010-05-31 23:36:05 UTC (rev 11009)
@@ -0,0 +1,11 @@
+--- teeworlds-0.5.2.orig/default.bam
++++ teeworlds-0.5.2/default.bam
+@@ -287,6 +287,8 @@ release_settings.debug = 0
+ release_settings.cc.optimize = 1
+ release_settings.cc.defines:Add("CONF_RELEASE")
+ 
++Import("debian.bam")
++
+ if platform == "macosx"  and arch == "ia32" then
+ 	debug_settings_ppc = debug_settings:Copy()
+ 	debug_settings_ppc.config_name = "debug_ppc"

Modified: packages/trunk/teeworlds/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series	2010-05-31 22:25:10 UTC (rev 11008)
+++ packages/trunk/teeworlds/debian/patches/series	2010-05-31 23:36:05 UTC (rev 11009)
@@ -1,3 +1,4 @@
 system-libs.patch
 new-wavpack.patch
 set-data-dir.patch
+pass-build-flags.patch

Modified: packages/trunk/teeworlds/debian/rules
===================================================================
--- packages/trunk/teeworlds/debian/rules	2010-05-31 22:25:10 UTC (rev 11008)
+++ packages/trunk/teeworlds/debian/rules	2010-05-31 23:36:05 UTC (rev 11009)
@@ -5,16 +5,20 @@
 	dh $@
 
 override_dh_auto_build:
-	bam release
+	echo "release_settings.cc.optimize = 0" >> debian.bam
+	echo "release_settings.cc.flags:Add(\"$(CFLAGS)\")" >> debian.bam
+	echo "release_settings.link.flags:Add(\"$(LDFLAGS)\")" >> debian.bam
+	bam -v release
 
 override_dh_auto_install:
 	mv teeworlds_srv teeworlds-server
 
 override_dh_auto_clean:
+	touch debian.bam
 	bam -c
 	find -type f -name '*.o' -exec rm {} \;
 	rm -rf src/engine/external # Drop the embedded libs to be sure with link the system side lib
-	rm -rf tmp.* debian/stamp-patched .pc config.bam fake_server map_resave crapnet
+	rm -rf tmp.* config.bam debian.bam fake_server map_resave crapnet
 	rm -rf tileset_borderfix teeworlds_srv dilate versionsrv packetgen mastersrv teeworlds
 	rm -f datasrc/*.pyc