[fenix] 108/127: Don't pass --as-needed in fxi/src/Makefile --as-needed was passed to gcc and produced a FTBFS with gcc 4.6

[Peter Pentchev]

This is an automated email from the git hooks/post-receive script.

roam-guest pushed a commit to branch master
in repository fenix.

commit d9d5bb194edc5a22b13090bcbf7864c643b04ea5
Author: Evgeni Golov <evgeni at debian.org>
Date:   Fri May 6 23:37:13 2011 +0000

    Don't pass --as-needed in fxi/src/Makefile
    --as-needed was passed to gcc and produced a FTBFS with gcc 4.6
---
 debian/changelog                                   |  8 +++++++
 .../no_--as-needed_in_fxi-src-Makefile.patch       | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d1a57d7..047acdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch b/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
new file mode 100644
index 0000000..11f271b
--- /dev/null
+++ b/debian/patches/no_--as-needed_in_fxi-src-Makefile.patch
@@ -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 \
diff --git a/debian/patches/series b/debian/patches/series
index afeb6af..61a3a3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ string_alloc_crash.patch
 spelling.patch
 headers.patch
 kfreebsd.patch
+no_--as-needed_in_fxi-src-Makefile.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git