Author: sistpoty-guest Date: 2009-10-30 21:21:56 +0000 (Fri, 30 Oct 2009) New Revision: 10469
Added: packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch Removed: packages/trunk/invaders/debian/patches/02-amd64.patch Modified: packages/trunk/invaders/debian/changelog packages/trunk/invaders/debian/patches/series Log: * rename patch (since it's no longer just for amd64) * import changes from Kees Cook to build with stack-protector enabled * add new UNRELEASED changelog entry * add a big fat warning sign that it's not yet tested and shouldn't get uploaded (yet). Modified: packages/trunk/invaders/debian/changelog =================================================================== --- packages/trunk/invaders/debian/changelog 2009-10-29 14:32:09 UTC (rev 10468) +++ packages/trunk/invaders/debian/changelog 2009-10-30 21:21:56 UTC (rev 10469) @@ -1,3 +1,14 @@ +invaders (1.0.0-10) UNRELEASED; urgency=low + + * Fix build failures if stack-protector is enabled by default, + thanks to Kees Cook for the patches: + + rename debian/patches/02-amd64.patch to 02-gcc-ldflags.patch + + move -nostdlib to CFLAGS, as it's a compiler flag + + use CFLAGS for linking as well (since gcc is used) + * UNTESTED YET... DO NOT UPLOAD unless you tested it. + + -- Stefan Potyra <[email protected]> Fri, 30 Oct 2009 22:19:42 +0100 + invaders (1.0.0-9) unstable; urgency=low [ Fabian Greffrath ] Deleted: packages/trunk/invaders/debian/patches/02-amd64.patch =================================================================== --- packages/trunk/invaders/debian/patches/02-amd64.patch 2009-10-29 14:32:09 UTC (rev 10468) +++ packages/trunk/invaders/debian/patches/02-amd64.patch 2009-10-30 21:21:56 UTC (rev 10469) @@ -1,15 +0,0 @@ -Support for building on amd64 and fix an incompatibility with newer gcc and binutils. - ---- invaders.orig/compile.sh -+++ invaders/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="-fno-builtin -nostdinc -O2 -I. -Wall -Werror -m32" -+LDFLAGS="-nostdlib -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 Copied: packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch (from rev 10468, packages/trunk/invaders/debian/patches/02-amd64.patch) =================================================================== --- packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch (rev 0) +++ packages/trunk/invaders/debian/patches/02-gcc-ldflags.patch 2009-10-30 21:21:56 UTC (rev 10469) @@ -0,0 +1,24 @@ +Support for building on amd64 and fix an incompatibility with newer gcc and binutils. + +Index: invaders-1.0.0/compile.sh +=================================================================== +--- invaders-1.0.0.orig/compile.sh 2001-05-21 22:26:46.000000000 +0200 ++++ invaders-1.0.0/compile.sh 2009-10-30 21:52:57.000000000 +0100 +@@ -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="-fno-builtin -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 Modified: packages/trunk/invaders/debian/patches/series =================================================================== --- packages/trunk/invaders/debian/patches/series 2009-10-29 14:32:09 UTC (rev 10468) +++ packages/trunk/invaders/debian/patches/series 2009-10-30 21:21:56 UTC (rev 10469) @@ -1,2 +1,2 @@ 01-pointer-targets-differ-in-signedness.patch -02-amd64.patch +02-gcc-ldflags.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
