r12215 - in packages/trunk/fenix/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2011-05-06 23:37:13 +0000 (Fri, 06 May 2011)
New Revision: 12215

Added:
   packages/trunk/fenix/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/patches/series
Log:
Don't pass --as-needed in fxi/src/Makefile 
--as-needed was passed to gcc and produced a FTBFS with gcc 4.6



Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2011-05-06 14:25:56 UTC (rev 12214)
+++ packages/trunk/fenix/debian/changelog	2011-05-06 23:37:13 UTC (rev 12215)
@@ -1,3 +1,11 @@
+fenix (0.92a.dfsg1-9) unstable; urgency=low
+
+  * Team upload.
+  * Don't pass --as-needed in fxi/src/Makefile
+    --as-needed was passed to gcc and produced a FTBFS with gcc 4.6.
+
+ -- Evgeni Golov <evgeni at debian.org>  Sat, 07 May 2011 01:34:18 +0200
+
 fenix (0.92a.dfsg1-8) unstable; urgency=low
 
   * Add the kfreebsd patch to fix the FTBFS on GNU/kFreeBSD.

Added: packages/trunk/fenix/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
===================================================================
--- packages/trunk/fenix/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch	                        (rev 0)
+++ packages/trunk/fenix/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch	2011-05-06 23:37:13 UTC (rev 12215)
@@ -0,0 +1,26 @@
+Description: Do not pass --as-needed
+ --as-needed was passed to gcc and produced a FTBFS with gcc 4.6
+Author: Evgeni Golov <evgeni at debian.org>
+
+--- fenix-0.92a.dfsg1.orig/fxi/src/Makefile.am
++++ fenix-0.92a.dfsg1/fxi/src/Makefile.am
+@@ -7,8 +7,6 @@ INCLUDES = $(COMMON_CFLAGS) $(SDL_CFLAGS
+ 
+ fxi_LDADD = $(SDL_LIBS) $(COMMON_LIBS) -lz -lpng -lSDL_mixer
+ 
+-fxi_LDFLAGS = --as-needed
+-
+ SOURCE_FILES = main.c dcbr.c instance.c strings.c \
+               i_main.c i_debug.c i_func.c \
+ 	          g_main.c g_maps.c g_blit.c g_texts.c g_pal.c g_draw.c \
+--- fenix-0.92a.dfsg1.orig/fxi/src/Makefile.in
++++ fenix-0.92a.dfsg1/fxi/src/Makefile.in
+@@ -147,8 +147,6 @@ INCLUDES = $(COMMON_CFLAGS) $(SDL_CFLAGS
+ 
+ fxi_LDADD = $(SDL_LIBS) $(COMMON_LIBS) -lz -lpng -lSDL_mixer
+ 
+-fxi_LDFLAGS = --as-needed
+-
+ SOURCE_FILES = main.c dcbr.c instance.c strings.c \
+               i_main.c i_debug.c i_func.c \
+ 	          g_main.c g_maps.c g_blit.c g_texts.c g_pal.c g_draw.c \

Modified: packages/trunk/fenix/debian/patches/series
===================================================================
--- packages/trunk/fenix/debian/patches/series	2011-05-06 14:25:56 UTC (rev 12214)
+++ packages/trunk/fenix/debian/patches/series	2011-05-06 23:37:13 UTC (rev 12215)
@@ -25,3 +25,4 @@
 spelling.patch
 headers.patch
 kfreebsd.patch
+no_--as-needed_in_fxi-src-Makefile.patch