Fix from Chromium OS for cross-compiling.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 76 insertions, 2 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 70a076f89c8b..7bc9d40619c3 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.540 2015/05/15 10:56:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.541 2015/05/16 08:52:41 vapier Exp $
+
+  16 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/gnutls-2.12.23-cross-compile.patch, gnutls-2.12.23-r6.ebuild:
+  Fix from Chromium OS for cross-compiling.
 
   15 May 2015; Pacho Ramos <pacho@gentoo.org> gnutls-3.3.15.ebuild:
   ppc stable wrt bug #548636
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch b/net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch
new file mode 100644
index 000000000000..31178fcd8c46
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch
@@ -0,0 +1,69 @@
+use pkg-config to locate zlib rather than hardcoding system -L/-I paths
+
+for pthreads, just hardcode it enabled
+
+for gnutls, don't hardcode -L/-I all the time to the host paths
+
+--- a/lib/configure.ac
++++ b/lib/configure.ac
+@@ -70,26 +70,23 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
+ AC_MSG_CHECKING([whether to include zlib compression support])
+ if test x$ac_zlib != xno; then
+  AC_MSG_RESULT(yes)
+- AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
+- if test "$ac_cv_libz" != yes; then
+-   AC_MSG_WARN(
+-*** 
+-*** ZLIB was not found. You will not be able to use ZLIB compression.)
+- fi
+ else
+  AC_MSG_RESULT(no)
+ fi
+ 
+-PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
+-
+ if test x$ac_zlib != xno; then
++  PKG_CHECK_MODULES(ZLIB, zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
+   if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
++    LTLIBZ=$ZLIB_LIBS
++    AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled])
++    AC_SUBST(LTLIBZ)
+     if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
+       GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
+     else
+       GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
+     fi
+   else
++    AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
+     GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"
+   fi
+ fi
+@@ -124,10 +121,12 @@ fi
+ lgl_INIT
+ 
+ AC_CHECK_FUNCS(getrusage,,)
+-AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
++LTLIBPTHREAD='-pthread'
++AC_DEFINE([HAVE_LIBPTHREAD], [1], [pthread enabled])
++AC_SUBST(LTLIBPTHREAD)
+ 
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
+-LIBGNUTLS_CFLAGS="-I${includedir}"
++LIBGNUTLS_LIBS="-lgnutls $LIBS"
++LIBGNUTLS_CFLAGS=""
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ 
+--- a/libextra/configure.ac
++++ b/libextra/configure.ac
+@@ -41,8 +41,8 @@ LIBGNUTLS_EXTRA_HOOKS
+ 
+ xgl_INIT
+ 
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS=""
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
+ 
diff --git a/net-libs/gnutls/gnutls-2.12.23-r6.ebuild b/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
index ece8fd09bc7c..6cd69da2823b 100644
--- a/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r6.ebuild,v 1.13 2015/04/03 17:21:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r6.ebuild,v 1.14 2015/05/16 08:52:41 vapier Exp $
 
 EAPI=5
 
@@ -64,6 +64,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-CVE-2014-3467.patch
 	epatch "${FILESDIR}"/${P}-CVE-2014-3468.patch
 	epatch "${FILESDIR}"/${P}-CVE-2014-3469.patch
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
 
 	# support user patches
 	epatch_user