Add patch to fix building with --as-needed, closes bug #247251.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64

4 files changed, 53 insertions, 5 deletions

diff --git a/dev-util/valkyrie/ChangeLog b/dev-util/valkyrie/ChangeLog
index d3ee6ae59125..143363c8dd8b 100644
--- a/dev-util/valkyrie/ChangeLog
+++ b/dev-util/valkyrie/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/valkyrie
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/ChangeLog,v 1.9 2008/07/27 21:42:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/ChangeLog,v 1.10 2008/11/26 00:45:04 flameeyes Exp $
+
+  26 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/valkyrie-1.3.0-asneeded.patch, valkyrie-1.3.0.ebuild:
+  Add patch to fix building with --as-needed, closes bug #247251.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> valkyrie-1.2.0.ebuild,
   valkyrie-1.3.0.ebuild:
diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
index 00a8c30b4719..36cf1c40a388 100644
--- a/dev-util/valkyrie/Manifest
+++ b/dev-util/valkyrie/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX valkyrie-1.2.0-warnings.patch 2206 RMD160 a826fd8f36f0502fa3c385821f7d84694961eb37 SHA1 fdf80889f1bd1f94c37ed4a7a55218a6a68947f5 SHA256 3d4a78c20f44bca6dcca6f1a34060b51d5b677367d5ebdaaa41306c75cfe5f37
+AUX valkyrie-1.3.0-asneeded.patch 965 RMD160 fe1e5333245d398a0330b7169bf691e83dd6b4b5 SHA1 8dfec72ccdc0b65006b0cd03581956dfc06e2e72 SHA256 2eb5e664a41200477120a6476f927e22cf6cf98b91dd5eae1f327aef11261508
 DIST valkyrie-1.2.0.tar.bz2 369806 RMD160 5afbb8e461bd6f85dd426eef45892136104f0256 SHA1 ca2711c473b9c1c7fc1b831febd99bbee9b6716d SHA256 a93192748d4134eacd072b74743404326925bf1669c52df2b4e75ef5118ec43b
 DIST valkyrie-1.3.0.tar.bz2 365170 RMD160 5b28def8156597c54647acc784592bb2ec7a23ab SHA1 4c360863f02bff453cf05de73be29ce9407e5567 SHA256 3ba58df959e192e83616db3318af20a61db11fb29c26f7cc7ce9325586d1b862
 EBUILD valkyrie-1.2.0.ebuild 1131 RMD160 43a7ad5402737434bbbe3f34e90ac119fed05bf7 SHA1 646c1266ab29a0a0ac30cdd650b4a3415dfd6cb9 SHA256 c2cc7588d978c0961dbff6a166c613499bcb1965019427b58c7975807c9ae191
-EBUILD valkyrie-1.3.0.ebuild 1045 RMD160 9ff678e4b8908470fb4305c50fed7e6afae6555a SHA1 684ffbd70078dac779f547fb836b2e79576cd9d3 SHA256 f2ff4d0fe4ecaf8f695c8a69f4bfe251def8951f245c420af6590d83c7a34da7
-MISC ChangeLog 1751 RMD160 1628c6b470d217a8f334ffb77134f299a048d899 SHA1 06d572bf466b15c017c307a6c4f73392805c2294 SHA256 1ea3e8e4ba947d59e03c9dccbbdf60e9caab5fe6bb509c59dffc471193122711
+EBUILD valkyrie-1.3.0.ebuild 1171 RMD160 2aa02866497f2a913853103a1864e276d0924723 SHA1 0a5183b1360ab896ddc356b39c8d06bb5039899f SHA256 9d600346a73eb019d4104febd14f088694ddb99c1a94f7a355582c16b2420189
+MISC ChangeLog 1942 RMD160 64ccf8ff602bcec46081171097864985e4eaab66 SHA1 fd138fba247dbc6e7ccd078d72963732e0fa93bb SHA256 8388bba30a7b4aca1f943e18482e5b4f1938b6c14b28f295fe7172647253eba0
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkksnBcACgkQAiZjviIA2XhUdwCgraZy6Ykc0no2s5mcQj4IVNUe
+2PMAnjvujMam4ElZjfCqpMTMpyI1ox0X
+=MsGj
+-----END PGP SIGNATURE-----
diff --git a/dev-util/valkyrie/files/valkyrie-1.3.0-asneeded.patch b/dev-util/valkyrie/files/valkyrie-1.3.0-asneeded.patch
new file mode 100644
index 000000000000..eb4c656f9490
--- /dev/null
+++ b/dev-util/valkyrie/files/valkyrie-1.3.0-asneeded.patch
@@ -0,0 +1,25 @@
+Fix building with --as-needed forced on compiler specs.
+
+From: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>
+
+Libraries to link against need to go at the end of the linking line,
+not at the start, otherwise --as-needed will discard them.
+---
+
+ m4/bnv_have_qt.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+
+diff --git a/m4/bnv_have_qt.m4 b/m4/bnv_have_qt.m4
+index 3c6daf2..fe58759 100644
+--- a/m4/bnv_have_qt.m4
++++ b/m4/bnv_have_qt.m4
+@@ -316,7 +316,7 @@ EOF
+             echo "configure: could not compile:" >&AC_FD_CC
+             cat bnv_qt_main.$ac_ext >&AC_FD_CC
+           else
+-            bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>/dev/null"
++            bnv_try_4="$CXX -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null"
+             AC_TRY_EVAL(bnv_try_4)
+             if test x"$ac_status" != x0; then
+               echo "$bnv_err_4" >&AC_FD_CC
diff --git a/dev-util/valkyrie/valkyrie-1.3.0.ebuild b/dev-util/valkyrie/valkyrie-1.3.0.ebuild
index 55a363a1a9a4..f1f4a403ed1b 100644
--- a/dev-util/valkyrie/valkyrie-1.3.0.ebuild
+++ b/dev-util/valkyrie/valkyrie-1.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-1.3.0.ebuild,v 1.2 2008/07/27 21:42:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-1.3.0.ebuild,v 1.3 2008/11/26 00:45:04 flameeyes Exp $
 
 EAPI=1
-inherit eutils qt3
+inherit eutils qt3 autotools
 
 DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
 HOMEPAGE="http://www.open-works.co.uk/projects/valkyrie.html"
@@ -18,6 +18,14 @@ DEPEND="x11-libs/qt:3"
 RDEPEND="${DEPEND}
 	=dev-util/valgrind-3.3*"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
 src_compile() {
 	use debug || sed -i -e '/#define DEBUG_ON/ s:1:0:' \
 		"${S}/valkyrie/vk_utils.h"