diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-29 10:52:52 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-29 10:52:52 +0000 |
| commit | 51cee15e7ae80497f46c09ec3d446bc53e473c17 (patch) | |
| tree | b13732d24327cd39da3bc8750999b24b5ca413d0 | |
| parent | amd64 stable, bug 311837 (diff) | |
| download | gentoo-2-51cee15e7ae80497f46c09ec3d446bc53e473c17.tar.gz gentoo-2-51cee15e7ae80497f46c09ec3d446bc53e473c17.tar.bz2 gentoo-2-51cee15e7ae80497f46c09ec3d446bc53e473c17.zip | |
Fix building with -Wl,--as-needed wrt #285747 by Kacper Kowalik.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/nettle/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/nettle/files/nettle-2.0-asneeded.patch | 13 | ||||
| -rw-r--r-- | dev-libs/nettle/nettle-2.0.ebuild | 12 |
3 files changed, 24 insertions, 7 deletions
diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog index d19133b99e76..3227e31faed1 100644 --- a/dev-libs/nettle/ChangeLog +++ b/dev-libs/nettle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nettle # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.28 2010/01/14 21:26:17 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.29 2010/03/29 10:52:52 ssuominen Exp $ + + 29 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> nettle-2.0.ebuild, + +files/nettle-2.0-asneeded.patch: + Fix building with -Wl,--as-needed wrt #285747 by Kacper Kowalik. 14 Jan 2010; Christian Faulhammer <fauli@gentoo.org> nettle-2.0.ebuild: Transfer Prefix keywords diff --git a/dev-libs/nettle/files/nettle-2.0-asneeded.patch b/dev-libs/nettle/files/nettle-2.0-asneeded.patch new file mode 100644 index 000000000000..05e87bd95aae --- /dev/null +++ b/dev-libs/nettle/files/nettle-2.0-asneeded.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/show_bug.cgi?id=285747 + +--- configure.ac ++++ configure.ac +@@ -206,7 +206,7 @@ + LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' + LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(LIBHOGWEED_SONAME)' + # FIXME: It might make some sense to link with -lnettle -lgmp +- LIBHOGWEED_LIBS='' ++ LIBHOGWEED_LIBS='-L. -lnettle $(LIBS)' + ;; + esac + diff --git a/dev-libs/nettle/nettle-2.0.ebuild b/dev-libs/nettle/nettle-2.0.ebuild index 3d82e56a507e..c910510b1444 100644 --- a/dev-libs/nettle/nettle-2.0.ebuild +++ b/dev-libs/nettle/nettle-2.0.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.0.ebuild,v 1.7 2010/01/14 21:26:17 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.0.ebuild,v 1.8 2010/03/29 10:52:52 ssuominen Exp $ -EAPI="2" - -inherit autotools +EAPI=2 +inherit autotools eutils DESCRIPTION="cryptographic library that is designed to fit easily in any context" HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/" @@ -21,9 +20,10 @@ DEPEND="gmp? ( dev-libs/gmp ) RDEPEND="${DEPEND}" src_prepare() { + epatch "${FILESDIR}"/${P}-asneeded.patch sed -i \ -e '/CFLAGS/s:-ggdb3::' \ - configure.ac || die "sed configure.ac failed" + configure.ac || die eautoreconf } @@ -35,6 +35,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog NEWS README } |