[gentoo-commits] gentoo-x86 commit in net-libs/gnutls/files: gnutls-3.2.1-build-gmp-2.patch gnutls-3.2.1-build-gmp-1.patch gnutls-3.2.1-build-gmp-3.patch gnutls-3.2.1-build-gmp.patch

[Alon Bar-Lev (alonbl)]

alonbl      13/06/03 20:17:17

  Added:                gnutls-3.2.1-build-gmp-2.patch
                        gnutls-3.2.1-build-gmp-1.patch
                        gnutls-3.2.1-build-gmp-3.patch
  Removed:              gnutls-3.2.1-build-gmp.patch
  Log:
  backport patches from upstream related to bug#472056, should solve bug#472196
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

Revision  Changes    Path
1.1                  net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch?rev=1.1&content-type=text/plain

Index: gnutls-3.2.1-build-gmp-2.patch
===================================================================
From f3ef68f4f79434fadc3f28c649744e57f3eef99b Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@××××××.org>
Date: Mon, 3 Jun 2013 21:21:44 +0200
Subject: [PATCH] Add nettle dependencies to libcrypto.la

---
 lib/Makefile.am        |    1 -
 lib/nettle/Makefile.am |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3beb7c7..006f695 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -140,7 +140,6 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
 endif
 
 if ENABLE_NETTLE
-thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
 libgnutls_la_LIBADD += nettle/libcrypto.la
 endif
 
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 3dcb928..7b3f4c0 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -37,5 +37,6 @@ endif
 
 noinst_LTLIBRARIES = libcrypto.la
 
+libcrypto_la_LIBADD = $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
 libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
 	gnettle.h 
-- 
1.7.1




1.1                  net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch?rev=1.1&content-type=text/plain

Index: gnutls-3.2.1-build-gmp-1.patch
===================================================================
From 02eb70d6d96f624ed6cc55dfa62734495dffbb44 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@××××××.org>
Date: Sun, 2 Jun 2013 19:10:52 +0200
Subject: [PATCH] Directly link to gmp library. Based on original patch by Alon Bar-Lev <alon.barlev@×××××.com>.

---
 lib/Makefile.am        |    2 +-
 lib/gnutls.pc.in       |    2 +-
 lib/nettle/Makefile.am |    5 ++++-
 m4/hooks.m4            |   11 +++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f1e672c..3beb7c7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -140,7 +140,7 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
 endif
 
 if ENABLE_NETTLE
-thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS)
+thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
 libgnutls_la_LIBADD += nettle/libcrypto.la
 endif
 
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 13f2d3b..a25fcdf 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
 URL: http://www.gnutls.org/
 Version: @VERSION@
 Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@
+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
 @GNUTLS_REQUIRES_PRIVATE@
 Cflags: -I${includedir}
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index e2b704e..0987c8e 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -25,7 +25,10 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../includes		\
 	-I$(builddir)/../includes	\
 	-I$(builddir)/../../gl          \
-	-I$(srcdir)/..
+	-I$(srcdir)/..			\
+	$(NETTLE_CFLAGS)		\
+	$(HOGWEED_CFLAGS)		\
+	$(GMP_CFLAGS)
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(srcdir)/../minitasn1
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 3439edb..cd9ef5c 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -82,6 +82,17 @@ AC_MSG_ERROR([[
 
   GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
 
+  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.
+]])])
+  fi
+  AC_SUBST(GMP_CFLAGS)
+  AC_SUBST(GMP_LIBS)
+
   AC_ARG_WITH(included-libtasn1,
     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
       included_libtasn1=$withval,
-- 
1.7.1




1.1                  net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch?rev=1.1&content-type=text/plain

Index: gnutls-3.2.1-build-gmp-3.patch
===================================================================
From 8b64193ac7b30faa2213d5be6ee477db3a1f70a6 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@××××××.org>
Date: Mon, 3 Jun 2013 21:17:39 +0200
Subject: [PATCH] correctly place cflags

---
 lib/nettle/Makefile.am |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 0987c8e..3dcb928 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -18,17 +18,18 @@
 # 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) \
+	$(NETTLE_CFLAGS)		\
+	$(HOGWEED_CFLAGS)		\
+	$(GMP_CFLAGS)
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/../../gl		\
 	-I$(builddir)/../../gl		\
 	-I$(srcdir)/../includes		\
 	-I$(builddir)/../includes	\
 	-I$(builddir)/../../gl          \
-	-I$(srcdir)/..			\
-	$(NETTLE_CFLAGS)		\
-	$(HOGWEED_CFLAGS)		\
-	$(GMP_CFLAGS)
+	-I$(srcdir)/..
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(srcdir)/../minitasn1
-- 
1.7.1