On 2011-02-28 Matthias Klose <[email protected]> wrote: > Package: ggz-server > Version: 0.0.14.1-1.4 [...] > The package fails to build in a test rebuild on at least amd64 with > ld --no-add-needed. For details, please see: [...]
Hello, I have uploaded a NMU to DELAYED/3 with these changes: * debian/patches/ftbfs_gold.diff. Fix build with binutils-gold. Closes: #615722 * Empty dependency_libs in libtool la file. http://wiki.debian.org/ReleaseGoals/LAFileRemoval Patch attached. cu andreas
diff -u ggz-server-0.0.14.1/debian/changelog ggz-server-0.0.14.1/debian/changelog --- ggz-server-0.0.14.1/debian/changelog +++ ggz-server-0.0.14.1/debian/changelog @@ -1,3 +1,13 @@ +ggz-server (0.0.14.1-1.5) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/ftbfs_gold.diff. Fix build with binutils-gold. + Closes: #615722 + * Empty dependency_libs in libtool la file. + http://wiki.debian.org/ReleaseGoals/LAFileRemoval + + -- Andreas Metzler <[email protected]> Sun, 03 Apr 2011 15:00:51 +0200 + ggz-server (0.0.14.1-1.4) unstable; urgency=low * Non-maintainer upload. diff -u ggz-server-0.0.14.1/debian/rules ggz-server-0.0.14.1/debian/rules --- ggz-server-0.0.14.1/debian/rules +++ ggz-server-0.0.14.1/debian/rules @@ -29,0 +30,4 @@ + +common-install-arch:: + find debian/tmp/usr/lib -name "*.la" -exec \ + sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} + only in patch2: unchanged: --- ggz-server-0.0.14.1.orig/debian/patches/ftbfs_gold.diff +++ ggz-server-0.0.14.1/debian/patches/ftbfs_gold.diff @@ -0,0 +1,186 @@ +--- ggz-server-0.0.14.1.orig/ggzd/Makefile.am ++++ ggz-server-0.0.14.1/ggzd/Makefile.am +@@ -97,5 +97,5 @@ + $(top_builddir)/ggzd/database/libggzdb.a \ + $(ggzd_LIBS) \ + $(LIB_GGZ) \ +- $(LIB_DATABASE) ++ $(LIB_DATABASE) $(LIB_PTHREADS) + +--- ggz-server-0.0.14.1.orig/m4/zeroconf.m4 ++++ ggz-server-0.0.14.1/m4/zeroconf.m4 +@@ -40,7 +40,7 @@ + elif test "$zeroconf" = "avahi"; then + AC_DEFINE(WITH_AVAHI, 1, [Use avahi for zeroconf mechanism]) + AVAHI_INCLUDES="-I/usr/include" +- LIB_AVAHI="-lavahi-client" ++ LIB_AVAHI="-lavahi-client -lavahi-common" + AC_SUBST(AVAHI_INCLUDES) + AC_SUBST(LIB_AVAHI) + else +--- ggz-server-0.0.14.1.orig/game_servers/chinese-checkers/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/chinese-checkers/Makefile.am +@@ -17,5 +17,5 @@ + + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) +-ggzd_ccheckers_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la -lm ++ggzd_ccheckers_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la -lm $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/combat/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/combat/Makefile.am +@@ -18,4 +18,4 @@ + + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) +-ggzd_combat_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_combat_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) +--- ggz-server-0.0.14.1.orig/game_servers/spades/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/spades/Makefile.am +@@ -21,7 +21,7 @@ + socketfunc.c \ + socketfunc.h + +-ggzd_spades_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_spades_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + + AM_CPPFLAGS = $(LIBGGZ_INCLUDES) + +--- ggz-server-0.0.14.1.orig/game_servers/chess/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/chess/Makefile.am +@@ -17,5 +17,5 @@ + ai-gnuchess.h \ + ai-gnuchess.c + +-ggzd_chess_LDADD = $(LDADD) libcgc/libcgc.a $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_chess_LDADD = $(LDADD) libcgc/libcgc.a $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/geekgame/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/geekgame/Makefile.am +@@ -8,7 +8,7 @@ + ggzdexecmod_PROGRAMS = geekgameserver + geekgameserver_SOURCES = main.cpp geekgame.cpp + geekgameserver_LDADD = $(LDADD) \ +- $(top_builddir)/ggzdmod++/libggzdmod++.la ++ $(top_builddir)/ggzdmod++/libggzdmod++.la $(LIB_GGZ) + + noinst_HEADERS = geekgame.h protocol.h + +--- ggz-server-0.0.14.1.orig/game_servers/dots/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/dots/Makefile.am +@@ -16,5 +16,5 @@ + ai.h + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) +-ggzd_dots_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_dots_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/hastings/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/hastings/Makefile.am +@@ -15,5 +15,5 @@ + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) + +-ggzd_hastings_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_hastings_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/muehle/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/muehle/Makefile.am +@@ -12,7 +12,7 @@ + muehleserv_SOURCES = muehleserver.cpp loader.cpp main.cpp net.cpp + muehleserv_LDADD = $(LDADD) \ + qtserv/libqtserv.a \ +- $(top_builddir)/ggzdmod++/libggzdmod++.la ++ $(top_builddir)/ggzdmod++/libggzdmod++.la $(LIB_GGZ) + + noinst_HEADERS = muehleserver.h loader.h net.h + +--- ggz-server-0.0.14.1.orig/game_servers/ggzcards/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/ggzcards/Makefile.am +@@ -36,5 +36,5 @@ + + ggzd_ggzcards_LDADD = $(LDADD) games/libgames.a \ + common/libcommon.a \ +- $(top_builddir)/ggzdmod/libggzdmod.la ++ $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/tuxman/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/tuxman/Makefile.am +@@ -8,7 +8,7 @@ + ggzdexecmod_PROGRAMS = tuxmanserv + tuxmanserv_SOURCES = main.cpp map.cpp pacman.cpp tuxmanserv.cpp + tuxmanserv_LDADD = $(LDADD) \ +- $(top_builddir)/ggzdmod++/libggzdmod++.la ++ $(top_builddir)/ggzdmod++/libggzdmod++.la $(LIB_GGZ) + + noinst_HEADERS = map.h pacman.h tuxmanserv.h proto.h + +--- ggz-server-0.0.14.1.orig/game_servers/widelands/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/widelands/Makefile.am +@@ -8,7 +8,7 @@ + ggzdexecmod_PROGRAMS = widelands_server + widelands_server_SOURCES = main.cpp widelands_server.cpp + widelands_server_LDADD = $(LDADD) \ +- $(top_builddir)/ggzdmod++/libggzdmod++.la ++ $(top_builddir)/ggzdmod++/libggzdmod++.la $(LIB_GGZ) + + noinst_HEADERS = widelands_server.h protocol.h + +--- ggz-server-0.0.14.1.orig/game_servers/reversi/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/reversi/Makefile.am +@@ -16,5 +16,5 @@ + + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) +-ggzd_reversi_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_reversi_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/escape/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/escape/Makefile.am +@@ -15,5 +15,5 @@ + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) + +-ggzd_escape_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_escape_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/connectx/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/connectx/Makefile.am +@@ -11,5 +11,5 @@ + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) + +-ggzd_connectx_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_connectx_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/tictactoe/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/tictactoe/Makefile.am +@@ -19,5 +19,5 @@ + ttt-ai.h + + AM_CPPFLAGS = -I$(top_srcdir)/ggzdmod $(LIBGGZ_INCLUDES) +-ggzd_tictactoe_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la ++ggzd_tictactoe_LDADD = $(LDADD) $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + +--- ggz-server-0.0.14.1.orig/game_servers/krosswater/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/krosswater/Makefile.am +@@ -9,7 +9,7 @@ + krosswater_server_LDADD = $(LDADD) \ + zoneserver/libzoneserver.la \ + stackpath/libstackpath.a \ +- $(top_builddir)/ggzdmod/libggzdmod.la ++ $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + + AM_CPPFLAGS = -I $(top_srcdir)/game_servers/krosswater/stackpath \ + -I $(top_srcdir)/game_servers/krosswater/zoneserver \ +--- ggz-server-0.0.14.1.orig/game_servers/keepalive/src/Makefile.am ++++ ggz-server-0.0.14.1/game_servers/keepalive/src/Makefile.am +@@ -6,7 +6,7 @@ + ggzdexecmod_PROGRAMS = keepalivesrv + + keepalivesrv_SOURCES = main.cpp keepalive.cpp player.cpp world.cpp spectator.cpp +-keepalivesrv_LDADD = $(top_builddir)/ggzdmod/libggzdmod.la ++keepalivesrv_LDADD = $(top_builddir)/ggzdmod/libggzdmod.la $(LIB_GGZ) + + noinst_HEADERS = keepalive.h player.h world.h protocol.h spectator.h +
