Fix building with -Wl,--as-needed wrt #285747 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index d19133b99e76adb5fad2f73fe4dff2771bed5931..3227e31faed130b90683c08c57d551f28205ecb2 100644 (file)
--- 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/Manifest b/dev-libs/nettle/Manifest
index 95cc9c7b837af17c9beef20587a4295b2fd60060..396a9550be200982cd4807a68eae606e1da83adf 100644 (file)
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nettle-1.14-make-as-needed.patch 471 RMD160 a81f9d7337c99e8c8c86b6f60cf5d94693e67886 SHA1 43256f88cfc0db51012cde89882a92956c65f36b SHA256 f8552cde7b7c91923c276afca147e9c37b851b60896e1c9d5eb729ecd5bbc324
+AUX nettle-2.0-asneeded.patch 397 RMD160 735bbf72df60ee2538f04b591504d5c144e1f7a7 SHA1 fad5db4641b0bbce998d4809dc98df5e009ba7d6 SHA256 bac166a7ff2dbab851e2a138e7660be4b86f177647123c7ed451d152a0b68ff0
 DIST nettle-1.15.tar.gz 829862 RMD160 8944901d4a856bb25b8e44e420ba4475c0fd0a93 SHA1 0f2d95a859fc64ff3e490f9f2bec0d206ae95a7e SHA256 d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac
 DIST nettle-2.0.tar.gz 883732 RMD160 1e9e8b6f01276376514bee3d34aa479f5de44e0b SHA1 bfe436a556afecad0991fe4afef096992a77647f SHA256 65b9e230b953bfb075f10473917e216df9b825fc325b88f69cdf756ffa17cbd6
 EBUILD nettle-1.15.ebuild 1026 RMD160 864092c3efb84f94be150cb6c207c3fe43144683 SHA1 66f74f6e410634997925c3f3189bcc9344185e18 SHA256 8e90ca7bfbee72940dee00d31d4d729aa7f3deed632a601396cc8a6729ed7029
-EBUILD nettle-2.0.ebuild 1043 RMD160 9f4beab38c1d46eab04cffe6364a864061e562e7 SHA1 1e72dfdb2f8e26769263bcccc24c24b0363bb046 SHA256 efff56c4965a06fa0055853986d5af998a7293a168d6969726a94c117c5af89f
-MISC ChangeLog 3763 RMD160 b43ec467485f9b27bd207cbe14395c45c549ddb5 SHA1 cbbafd3c0aeb0a0a9d7d92180e54a102e8db21a1 SHA256 bcc3dd5df7c12479051bab6eb252aadf31f1db65df39be4631b7c8c19b91d7d4
+EBUILD nettle-2.0.ebuild 1044 RMD160 f918d36affce4d4fdb272c8be0d1c6bf0abc1633 SHA1 e5da5488a40fee84b4c1cabba8b94a7701ac1b08 SHA256 0d9a565c7e70e81e8f8cf22c5e2bda0239d2383190ef6a9ab1c4aa9dde6ceb4b
+MISC ChangeLog 3944 RMD160 904332e3d53d6aa61af2aa2c7b40973daf13ebc3 SHA1 636f5cfdef1dedad7c4823084fc941423cff51c6 SHA256 8ec41ae98e72436291565d9f3d8c576693dd72b38f491c8a0689bb0134435edc
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktPi/8ACgkQNQqtfCuFneOlMgCgjpCa5jkD1FmORurVIY2Qh8nC
-vh0AmgPRInYi01stsXU74i2cTFYbLdTE
-=XS/Q
------END PGP SIGNATURE-----

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 (file)
index 0000000..05e87bd
--- /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 3d82e56a507e375e504e0249ac253eb93c1047d5..c910510b1444bbf6bcea07cb678c2350fdaa82bc 100644 (file)
--- 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
 }