view src/gnutls-1-fixes.patch @ 2204:d791a56e9418

update package gnutls
author Mark Brand <mabrand@mabrand.nl>
date Sat, 07 Jan 2012 11:17:21 +0100
parents 579a86151bbc
children 572d4140383a
line wrap: on
line source

This file is part of mingw-cross-env.
See doc/index.html for further information.

Contains ad hoc patches for cross building.

From 69dd3870644eab761258bb27156af01dd29fb970 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 28 Oct 2011 09:23:41 +0200
Subject: [PATCH 1/3] add missing static library linking


diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 32170b6..de032a2 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system
 URL: http://www.gnu.org/software/gnutls/
 Version: @VERSION@
 Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBNETTLE@
+Libs.private: @LTLIBNETTLE@ @LIBS@
 @GNUTLS_REQUIRES_PRIVATE@
 Cflags: -I${includedir}
-- 
1.7.8


From 11b726a91ae04db0158c47cf4ce218fd823d7f4c Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 24 Nov 2011 14:40:11 +0100
Subject: [PATCH 2/3] don't try to build crywrap for windows


diff --git a/configure.ac b/configure.ac
index 78eb975..cd00934 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ else
 libidn=no
 fi
 
-AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno")
+AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$have_win" != "xyes" && test "x$libidn" != "xno")
 
 dnl end of crywrap requirements
 
-- 
1.7.8


From 020af519332485a21948e6662d347e33ecea7685 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Thu, 24 Nov 2011 15:06:06 +0100
Subject: [PATCH 3/3] disable doc and test (mingw-cross-env specific)


diff --git a/Makefile.am b/Makefile.am
index 16861a2..d48abdf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
 
-SUBDIRS = gl lib extra po src doc tests
+SUBDIRS = gl lib extra po src
 
 if HAVE_GUILE
 SUBDIRS += guile
-- 
1.7.8