diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2008-12-16 15:18:43 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2008-12-16 15:18:43 +0000 |
commit | 4b03fd0b8133eb537ce17e5cfc6d86fd72cc2eed (patch) | |
tree | 237d23c3aff0defe36aa090a25c308fdb7b296c5 /gnustep-apps/gnumail | |
parent | Stable for HPPA (bug #245517). (diff) | |
download | gentoo-2-4b03fd0b8133eb537ce17e5cfc6d86fd72cc2eed.tar.gz gentoo-2-4b03fd0b8133eb537ce17e5cfc6d86fd72cc2eed.tar.bz2 gentoo-2-4b03fd0b8133eb537ce17e5cfc6d86fd72cc2eed.zip |
Fix compilation with forced --as-needed, bug #251143
(Portage version: 2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'gnustep-apps/gnumail')
-rw-r--r-- | gnustep-apps/gnumail/ChangeLog | 6 | ||||
-rw-r--r-- | gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog index afbad0e02d3d..da7e5512dfe6 100644 --- a/gnustep-apps/gnumail/ChangeLog +++ b/gnustep-apps/gnumail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnustep-apps/gnumail # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.31 2008/08/06 16:58:25 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.32 2008/12/16 15:18:43 voyageur Exp $ + + 16 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org> + gnumail-1.2.0_pre3-r1.ebuild: + Fix compilation with forced --as-needed, bug #251143 06 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: add GLEP 56 USE flag desc from use.local.desc diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild index e178f9d934cc..655435be62b0 100644 --- a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild +++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild,v 1.6 2008/03/08 13:29:38 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild,v 1.7 2008/12/16 15:18:43 voyageur Exp $ inherit gnustep-2 @@ -19,7 +19,7 @@ SLOT="0" IUSE="crypt emoticon xface" DEPEND="=gnustep-libs/pantomime-${PV} >=gnustep-base/gnustep-gui-0.11.0 - gnustep-apps/addresses" + || ( gnustep-apps/addresses gnustep-libs/addresseskit )" RDEPEND="crypt? ( app-crypt/gnupg )" src_unpack() { @@ -28,6 +28,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-index.patch epatch "${FILESDIR}"/${P}-pgpversion.patch + sed -i -e 's|GNUMail_GUI_LIBS =|LIBRARIES_DEPEND_UPON +=|' \ + Framework/GNUMail/GNUmakefile || die "as-needed sed failed" sed -i -e \ 's|$(GNUSTEP_INSTALLATION_DIR)/Library|$(DESTDIR)$(GNUSTEP_SYSTEM_LIBRARY)|' \ Bundles/*/GNUmakefile || die "gnustep-make-2 sed failed" |