[lordsawar] 65/133: Include ftbfs_as-needed.diff by Ilya Barygin to fix FTBFS with ld --as-needed
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Jul 2 17:37:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository lordsawar.
commit 2773258b2ee745e880fa88f1f3bd0bf5e45e949c
Author: Alexander Reichle-Schmehl <tolimar at debian.org>
Date: Thu Jan 19 11:49:19 2012 +0000
Include ftbfs_as-needed.diff by Ilya Barygin to fix FTBFS with ld --as-needed
---
debian/changelog | 2 +
debian/patches/ftbfs_as-needed.diff | 142 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 145 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 95f8acd..e034325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ lordsawar (0.2.0-2) UNRELEASED; urgency=low
* NOT RELEASED YET
* Stopp build-depending on libggz-dev, libggzdmod-dev and libggzmod-dev.
Apparently they are no longer used (Closes: #655401)
+ * Include ftbfs_as-needed.diff by Ilya Barygin to fix FTBFS with ld
+ --as-needed (Closes: #631738)
-- Alexander Reichle-Schmehl <tolimar at debian.org> Tue, 29 Mar 2011 16:12:45 +0200
diff --git a/debian/patches/ftbfs_as-needed.diff b/debian/patches/ftbfs_as-needed.diff
new file mode 100644
index 0000000..f03bb4d
--- /dev/null
+++ b/debian/patches/ftbfs_as-needed.diff
@@ -0,0 +1,142 @@
+Description: Correct the order of linker parameters so that it doesn't fail
+ with --as-needed option.
+Author: Ilya Barygin <barygin at gmail.com>
+Bug-Ubuntu: https://launchpad.net/bugs/770984
+--- a/src/pbm/Makefile.am
++++ b/src/pbm/Makefile.am
+@@ -23,8 +23,8 @@
+ lordsawar_pbm_SOURCES = pbm.cpp main.cpp pbm.h ${top_srcdir}/src/pbm-game-client.cpp ${top_srcdir}/src/pbm-game-client.h ${top_srcdir}/src/game-client-decoder.cpp ${top_srcdir}/src/game-client-decoder.h ${top_srcdir}/src/chat-client.cpp ${top_srcdir}/src/chat-client.h
+
+
+-lordsawar_pbm_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_pbm_LDADD = $(top_builddir)/src/liblordsawar.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+ ##endif
+--- a/src/pbm/Makefile.in
++++ b/src/pbm/Makefile.in
+@@ -283,8 +283,8 @@
+ # 02110-1301, USA.
+ MAINTAINERCLEANFILES = Makefile.in
+ lordsawar_pbm_SOURCES = pbm.cpp main.cpp pbm.h ${top_srcdir}/src/pbm-game-client.cpp ${top_srcdir}/src/pbm-game-client.h ${top_srcdir}/src/game-client-decoder.cpp ${top_srcdir}/src/game-client-decoder.h ${top_srcdir}/src/chat-client.cpp ${top_srcdir}/src/chat-client.h
+-lordsawar_pbm_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_pbm_LDADD = $(top_builddir)/src/liblordsawar.la -lz \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
+--- a/src/gls/Makefile.am
++++ b/src/gls/Makefile.am
+@@ -22,20 +22,20 @@
+ lordsawar_game_list_client_SOURCES = gls-client-main.cpp \
+ gls-client-tool.cpp gls-client-tool.h
+
+-lordsawar_game_list_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_list_client_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
+ lordsawar_game_list_server_SOURCES = main.cpp \
+ gamelist-server.cpp gamelist-server.h
+
+-lordsawar_game_list_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_list_server_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+ ##endif
+--- a/src/gls/Makefile.in
++++ b/src/gls/Makefile.in
+@@ -296,20 +296,20 @@
+ lordsawar_game_list_client_SOURCES = gls-client-main.cpp \
+ gls-client-tool.cpp gls-client-tool.h
+
+-lordsawar_game_list_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_list_client_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
+ lordsawar_game_list_server_SOURCES = main.cpp \
+ gamelist-server.cpp gamelist-server.h
+
+-lordsawar_game_list_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_list_server_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
+--- a/src/ghs/Makefile.am
++++ b/src/ghs/Makefile.am
+@@ -22,22 +22,22 @@
+ lordsawar_game_host_client_SOURCES = ghs-client-main.cpp \
+ ghs-client-tool.cpp ghs-client-tool.h
+
+-lordsawar_game_host_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_host_client_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawargamehost.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
+ lordsawar_game_host_server_SOURCES = main.cpp \
+ gamehost-server.cpp gamehost-server.h
+
+-lordsawar_game_host_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_host_server_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawargamehost.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+ ##endif
+--- a/src/ghs/Makefile.in
++++ b/src/ghs/Makefile.in
+@@ -298,22 +298,22 @@
+ lordsawar_game_host_client_SOURCES = ghs-client-main.cpp \
+ ghs-client-tool.cpp ghs-client-tool.h
+
+-lordsawar_game_host_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_host_client_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawargamehost.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
+ lordsawar_game_host_server_SOURCES = main.cpp \
+ gamehost-server.cpp gamehost-server.h
+
+-lordsawar_game_host_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+- $(top_builddir)/src/liblordsawar.la \
++lordsawar_game_host_server_LDADD = $(top_builddir)/src/liblordsawar.la \
+ $(top_builddir)/src/liblordsawargamelist.la \
+ $(top_builddir)/src/liblordsawargamehost.la \
+ $(top_builddir)/src/liblordsawarnet.la \
++ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
+ @LIBINTL@ \
+ -L$(top_builddir)/src
+
diff --git a/debian/patches/series b/debian/patches/series
index 4e3f1c6..7037084 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
#No current patches
+ftbfs_as-needed.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git
More information about the Pkg-games-commits
mailing list