Author: debfx-guest
Date: 2011-05-24 08:47:48 +0000 (Tue, 24 May 2011)
New Revision: 12420
Modified:
packages/trunk/holotz-castle/debian/changelog
packages/trunk/holotz-castle/debian/patches/02_makefile.patch
Log:
Fix FTBFS with ld --as-needed.
Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog 2011-05-24 08:42:24 UTC
(rev 12419)
+++ packages/trunk/holotz-castle/debian/changelog 2011-05-24 08:47:48 UTC
(rev 12420)
@@ -1,9 +1,11 @@
-holotz-castle (1.3.14-4) UNRELEASED; urgency=low
+holotz-castle (1.3.14-4) unstable; urgency=low
* Team upload.
* Don't build with -Werror as it causes FTBFS with gcc 4.6. (Closes: #625353)
- Update 02_makefile.patch
- Thanks to Andreas Moog for the patch.
+ * Fix FTBFS with ld --as-needed.
+ - Update 02_makefile.patch
-- Felix Geyer <[email protected]> Tue, 24 May 2011 10:21:41 +0200
Modified: packages/trunk/holotz-castle/debian/patches/02_makefile.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/02_makefile.patch
2011-05-24 08:42:24 UTC (rev 12419)
+++ packages/trunk/holotz-castle/debian/patches/02_makefile.patch
2011-05-24 08:47:48 UTC (rev 12420)
@@ -12,28 +12,31 @@
endif
DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
-@@ -42,7 +42,8 @@
+@@ -42,8 +42,10 @@
# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile
de JLib.
# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
-CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags`
-I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow
$(CPU_OPTS) -ffast-math -c
+-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG)
--libs`
+MORE_CFLAGS= -O3
+CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags`
-I/usr/local/include/ -I/usr/local/include/SDL $(MORE_CFLAGS) -Wall -Wshadow
$(CPU_OPTS) -ffast-math -c
- LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG)
--libs`
++LDFLAGS=-ffast-math
++LIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lz
-@@ -53,12 +54,12 @@
+ JLib:
+@@ -53,12 +55,12 @@
g++ $(CFLAGS) $(DEFINES) $< -o $@
HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
- g++ $(LDFLAGS) $? -o $@;\
-+ g++ $(LDFLAGS) $? -o $@ -lz;\
++ g++ $(LDFLAGS) $? -o $@ $(LIBS);\
mv HC ../holotz-castle
# HCed (Holotz's Castle editor).
HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
- g++ $(LDFLAGS) $? -o $@;\
-+ g++ $(LDFLAGS) $? -o $@ -lz;\
++ g++ $(LDFLAGS) $? -o $@ $(LIBS);\
mv HCed ../holotz-castle-editor
install:
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
