From: Guillem Jover <guillem@debian.org>
Date: Mon, 19 May 2008 04:33:49 +0000 (+0300)
Subject: Fix link order when using libcompat.a and libintl.a
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16efeda6ccc227384326a059bb75f7362a5ce609;p=dpkg

Fix link order when using libcompat.a and libintl.a

Place them after libdpkg.a.
Based on a patch by Martin Koeppe. Closes: #481805
---

diff --git a/ChangeLog b/ChangeLog
index ed13abba..24219abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-19  Martin Koeppe  <mkoeppe@gmx.de>,
+            Guillem Jover  <guillem@debian.org>
+
+	* dpkg-deb/Makefile.am (dpkg_deb_LDADD): Move 'libcompat.a' and
+	'$(LIBINTL)' after 'libdpkg.a'.
+	* dpkg-split/Makefile.am (dpkg_split_LDADD): Likewise.
+	* dselect/Makefile.am (dselect_LDADD): Likewise.
+	* /src/Makefile.am (dpkg_LDADD): Likewise.
+	(dpkg_query_LDADD): Likewise.
+	(dpkg_trigger_LDADD): Likewise.
+
 2008-05-19  Guillem Jover  <guillem@debian.org>
 
 	* scripts/Dpkg/Source/Package.pm ($diff_ignore_default_regexp): Add
diff --git a/THANKS b/THANKS
index f54f8654..d203253e 100644
--- a/THANKS
+++ b/THANKS
@@ -108,6 +108,7 @@ Marcel Toele <mtoele@kern.nl>
 Marco d'Itri <md@linux.it>
 Marcus Brinkmann <brinkmd@debian.org> 
 Mark Rosenstand <mark@borkware.net>
+Martin Koeppe <mkoeppe@gmx.de>
 Masato Taruishi <taru@debian.or.jp>
 Mathias Weidner <mathias@weidner.in-bad-schmiedeberg.de>
 Matt Kraai <kraai@ftbfs.org>
diff --git a/debian/changelog b/debian/changelog
index a3744cd5..c2889006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Mark and coalesce similar strings for translation.
   * Add '.be' to the default dpkg-source -i regex. Closes: #481716
     Based on a patch by Ben Finney.
+  * Fix link order when using libcompat.a and libintl.a by placing them after
+    libdpkg.a. Based on a patch by Martin Koeppe. Closes: #481805
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am
index d433cb42..e948c439 100644
--- a/dpkg-deb/Makefile.am
+++ b/dpkg-deb/Makefile.am
@@ -17,5 +17,10 @@ dpkg_deb_SOURCES = \
 	main.c
 
 dpkg_deb_LDADD = \
+	../lib/libdpkg.a \
 	../libcompat/libcompat.a \
-	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+	$(LIBINTL) \
+	$(ZLIB_LIBS) \
+	$(BZ2_LIBS) \
+	$(SELINUX_LIBS)
+
diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am
index 7d85d15c..e596351c 100644
--- a/dpkg-split/Makefile.am
+++ b/dpkg-split/Makefile.am
@@ -19,9 +19,9 @@ dpkg_split_SOURCES = \
 	split.c
 
 dpkg_split_LDADD = \
+	../lib/libdpkg.a \
 	../libcompat/libcompat.a \
-	$(LIBINTL) \
-	../lib/libdpkg.a
+	$(LIBINTL)
 
 
 pkglib_SCRIPTS = mksplit
diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index f4a97ad6..c0bb6bc7 100644
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -35,10 +35,10 @@ dselect_SOURCES = \
 	pkgtop.cc
 
 dselect_LDADD = \
-	../libcompat/libcompat.a \
-	$(LIBINTL) \
 	$(CURSES_LIBS) \
-	../lib/libdpkg.a
+	../lib/libdpkg.a \
+	../libcompat/libcompat.a \
+	$(LIBINTL)
 
 
 EXTRA_DIST = keyoverride mkcurkeys.pl
diff --git a/src/Makefile.am b/src/Makefile.am
index a1377e75..25c3757e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,8 +28,12 @@ dpkg_SOURCES = \
 	update.c
 
 dpkg_LDADD = \
+	../lib/libdpkg.a \
 	../libcompat/libcompat.a \
-	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+	$(LIBINTL) \
+	$(ZLIB_LIBS) \
+	$(BZ2_LIBS) \
+	$(SELINUX_LIBS)
 
 dpkg_query_SOURCES = \
 	errors.c \
@@ -37,17 +41,17 @@ dpkg_query_SOURCES = \
 	query.c
 
 dpkg_query_LDADD = \
+	../lib/libdpkg.a \
 	../libcompat/libcompat.a \
-	$(LIBINTL) \
-	../lib/libdpkg.a
+	$(LIBINTL)
 
 dpkg_trigger_SOURCES = \
 	trigcmd.c
 
 dpkg_trigger_LDADD = \
+	../lib/libdpkg.a \
 	../libcompat/libcompat.a \
-	$(LIBINTL) \
-	../lib/libdpkg.a
+	$(LIBINTL)
 
 install-data-local:
 	$(mkdir_p) $(DESTDIR)$(admindir)/alternatives