link explicitly against gmp, bug#472056

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

3 files changed, 70 insertions, 2 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 7a29d54dd92d..8098391be0ab 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.432 2013/06/01 19:59:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.433 2013/06/02 12:30:18 alonbl Exp $
+
+  02 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnutls-3.2.1-build-gmp.patch, gnutls-3.2.1.ebuild:
+  link explicitly against gmp, bug#472056
 
 *gnutls-3.2.1 (01 Jun 2013)
 
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch
new file mode 100644
index 000000000000..1efce4ff1741
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp.patch
@@ -0,0 +1,61 @@
+From e6ee5b82b8141db62f12c509ef9c5f58bb683544 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 2 Jun 2013 15:22:07 +0300
+Subject: [PATCH] build: explicit linkage with gmp library
+
+gnutls uses gmp library explicitly so it needs to explicit link against
+it so that all symbols may be resolved.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lib/nettle/Makefile.am |  3 ++-
+ m4/hooks.m4            | 12 +++++++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
+index e2b704e..56d180a 100644
+--- a/lib/nettle/Makefile.am
++++ b/lib/nettle/Makefile.am
+@@ -18,7 +18,7 @@
+ # You should have received a copy of the GNU Lesser General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>
+ 
+-AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
++AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(GMP_CFLAGS)
+ AM_CPPFLAGS = \
+ 	-I$(srcdir)/../../gl		\
+ 	-I$(builddir)/../../gl		\
+@@ -35,3 +35,4 @@ noinst_LTLIBRARIES = libcrypto.la
+ 
+ libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
+ 	gnettle.h 
++libcrypto_la_LIBADD = $(GMP_LIBS)
+diff --git a/m4/hooks.m4 b/m4/hooks.m4
+index 3439edb..ca71728 100644
+--- a/m4/hooks.m4
++++ b/m4/hooks.m4
+@@ -77,10 +77,20 @@ AC_MSG_ERROR([[
+   *** Libhogweed (nettle's companion library) was not found. Note that you must compile nettle with gmp support.
+ ]])
+   ])
++  AC_ARG_VAR(GMP_CFLAGS, [C compiler flags for gmp])
++  AC_ARG_VAR(GMP_LIBS, [linker flags for gmp])
++  if test x$GMP_LIBS = x; then
++    AC_CHECK_LIB(gmp, __gmpz_cmp, [GMP_LIBS="-lgmp"], [AC_MSG_ERROR([[
++*** 
++*** gmp was not found. while nettle was.
++]])])
++  fi
++  AC_SUBST(GMP_CFLAGS)
++  AC_SUBST(GMP_LIBS)
+   AM_CONDITIONAL(ENABLE_NETTLE, test "$cryptolib" = "nettle")
+   AC_DEFINE([HAVE_LIBNETTLE], 1, [nettle is enabled])
+ 
+-  GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
++  GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed, gmp"
+ 
+   AC_ARG_WITH(included-libtasn1,
+     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
+-- 
+1.8.1.5
+
diff --git a/net-libs/gnutls/gnutls-3.2.1.ebuild b/net-libs/gnutls/gnutls-3.2.1.ebuild
index 192c1f6662a2..48f4b8e097ea 100644
--- a/net-libs/gnutls/gnutls-3.2.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.1.ebuild,v 1.1 2013/06/01 19:59:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.1.ebuild,v 1.2 2013/06/02 12:30:18 alonbl Exp $
 
 EAPI=5
 
@@ -23,6 +23,7 @@ IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGU
 # use system libopts
 RDEPEND=">=dev-libs/libtasn1-2.14
 	>=dev-libs/nettle-2.7[gmp]
+	dev-libs/gmp
 	sys-devel/autogen
 	dane? ( net-dns/unbound )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
@@ -39,6 +40,8 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-build-gmp.patch"
+
 	# tests/suite directory is not distributed
 	sed -i \
 		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \