r12741 - in packages/trunk/invaders/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2011-10-31 13:04:23 +0000 (Mon, 31 Oct 2011)
New Revision: 12741

Added:
   packages/trunk/invaders/debian/patches/02-build-flags.patch
Removed:
   packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch
Modified:
   packages/trunk/invaders/debian/changelog
Log:
Rename 02-gcc-ldflags.patch to 02-build-flags.patch, clean up CFLAGS
and LDFLAGS a bit (we don't need -m32 twice) and replace -Werror with -W.

Modified: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog	2011-10-31 12:25:02 UTC (rev 12740)
+++ packages/trunk/invaders/debian/changelog	2011-10-31 13:04:23 UTC (rev 12741)
@@ -2,6 +2,8 @@
 
   * Split 01-pointer-targets-differ-in-signedness.patch into two separate
     patches: 01-misspelling-loose.patch and 01-uint8-char.patch.
+  * Rename 02-gcc-ldflags.patch to 02-build-flags.patch, clean up CFLAGS
+    and LDFLAGS a bit (we don't need -m32 twice) and replace -Werror with -W.
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 31 Oct 2011 13:10:20 +0100
 

Copied: packages/trunk/invaders/debian/patches/02-build-flags.patch (from rev 12738, packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch)
===================================================================
--- packages/trunk/invaders/debian/patches/02-build-flags.patch	                        (rev 0)
+++ packages/trunk/invaders/debian/patches/02-build-flags.patch	2011-10-31 13:04:23 UTC (rev 12741)
@@ -0,0 +1,32 @@
+Author: Robert Millan <rmh at aybabtu.com>
+Author: Stefan Potyra <sistpoty at ubuntu.com>
+Author: Kees Cook <kees at ubuntu.com>
+Author: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Support for building on amd64 and others,
+ move -nostdlib to CFLAGS, as it's a compiler flag,
+ use CFLAGS for linking as well (since gcc is used),
+ replace -fno-builtin with -ffreestanding,
+ replace -Werror with -W,
+ and fix an incompatibility with newer gcc and binutils.
+
+--- invaders-1.0.0.orig/compile.sh
++++ invaders-1.0.0/compile.sh
+@@ -3,8 +3,8 @@
+ set -e
+ set -v
+ 
+-CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
+-LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
++CFLAGS="-ffreestanding -m32 -nostdinc -nostdlib -I. -O2 -W -Wall"
++LDFLAGS="-Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
+ gcc $CFLAGS -c keyboard.c
+ gcc $CFLAGS -c delay.c
+ gcc $CFLAGS -c common.c
+@@ -14,5 +14,5 @@ gcc $CFLAGS -c kernel.c
+ gcc $CFLAGS -c video.c
+ gcc $CFLAGS -c memory.c
+ gcc $CFLAGS -c boot.S
+-gcc $LDFLAGS -o invaders.exec boot.o kernel.o keyboard.o video.o game.o sound.o delay.o common.o memory.o
++gcc $CFLAGS $LDFLAGS -o invaders.exec boot.o kernel.o keyboard.o video.o game.o sound.o delay.o common.o memory.o
+ objcopy -O binary invaders.exec invaders

Deleted: packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch
===================================================================
--- packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch	2011-10-31 12:25:02 UTC (rev 12740)
+++ packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch	2011-10-31 13:04:23 UTC (rev 12741)
@@ -1,22 +0,0 @@
-Support for building on amd64 and fix an incompatibility with newer gcc and binutils.
-
---- invaders-1.0.0.orig/compile.sh
-+++ invaders-1.0.0/compile.sh
-@@ -3,8 +3,8 @@
- set -e
- set -v
- 
--CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
--LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
-+CFLAGS="-ffreestanding -nostdinc -O2 -I. -Wall -Werror -m32 -nostdlib"
-+LDFLAGS="-Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none -m32"
- gcc $CFLAGS -c keyboard.c
- gcc $CFLAGS -c delay.c
- gcc $CFLAGS -c common.c
-@@ -14,5 +14,5 @@
- gcc $CFLAGS -c video.c
- gcc $CFLAGS -c memory.c
- gcc $CFLAGS -c boot.S
--gcc $LDFLAGS -o invaders.exec boot.o kernel.o keyboard.o video.o game.o sound.o delay.o common.o memory.o
-+gcc $CFLAGS $LDFLAGS -o invaders.exec boot.o kernel.o keyboard.o video.o game.o sound.o delay.o common.o memory.o
- objcopy -O binary invaders.exec invaders