diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-26 00:45:04 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-26 00:45:04 +0000 |
| commit | 4c25d0d2276e11090e37335957c09802ec7ed6be (patch) | |
| tree | 4b61fb42f2a75bdab496db2938bdd810bdbd6433 /dev-util/valkyrie | |
| parent | Marking hunspell-1.2.6 ppc64 for bug 245518 (diff) | |
| download | gentoo-2-4c25d0d2276e11090e37335957c09802ec7ed6be.tar.gz gentoo-2-4c25d0d2276e11090e37335957c09802ec7ed6be.tar.bz2 gentoo-2-4c25d0d2276e11090e37335957c09802ec7ed6be.zip | |
Add patch to fix building with --as-needed, closes bug #247251.
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64)
Diffstat (limited to 'dev-util/valkyrie')
| -rw-r--r-- | dev-util/valkyrie/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/valkyrie/files/valkyrie-1.3.0-asneeded.patch | 25 | ||||
| -rw-r--r-- | dev-util/valkyrie/valkyrie-1.3.0.ebuild | 12 |
3 files changed, 40 insertions, 3 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/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" |