view src/gnutls-1-fixes.patch @ 5450:8bede4ae3bc6

Update gnutls to v3.6.14 * src/gnutls-1-fixes.patch: update patch * src/gnutls.mk: update version/checksum, simply build rule
author John Donoghue <john.donoghue@ieee.org>
date Fri, 05 Jun 2020 09:10:32 -0400
parents 62c18116dcb7
children 64fdd8f6efdd
line wrap: on
line source

This file is part of MXE. See LICENSE.md for licensing information.

Contains ad hoc patches for cross building.

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 6 Dec 2018 10:36:30 +0100
Subject: [PATCH 1/1] remove docs from configure.ac: avoid GTK_DOC dependencies


diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1145,17 +1145,6 @@ AC_DEFINE_UNQUOTED([INI_START_COMMENT_PREFIXES], [";#"], [The comment prefixes])
 AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
 AC_CONFIG_FILES([
   Makefile
-  doc/Makefile
-  doc/credentials/Makefile
-  doc/credentials/srp/Makefile
-  doc/credentials/x509/Makefile
-  doc/doxygen/Doxyfile
-  doc/examples/Makefile
-  doc/latex/Makefile
-  doc/manpages/Makefile
-  doc/reference/Makefile
-  doc/reference/version.xml
-  doc/scripts/Makefile
   extra/Makefile
   extra/includes/Makefile
   libdane/Makefile

diff -ur gnutls-3.6.14.orig/lib/Makefile.am gnutls-3.6.14/lib/Makefile.am
--- gnutls-3.6.14.orig/lib/Makefile.am	2020-06-03 15:36:52.735849576 -0400
+++ gnutls-3.6.14/lib/Makefile.am	2020-06-05 09:01:14.649375795 -0400
@@ -151,7 +151,7 @@
 	auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
 	extras/libgnutls_extras.la
 thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBNSL) \
-	$(P11_KIT_LIBS) $(LIB_SELECT) $(LIB_CRYPT32)
+	$(P11_KIT_LIBS) $(LIB_SELECT) $(LIB_CRYPT32) $(LIBNCRYPT)
 
 if HAVE_LIBIDN2
 thirdparty_libadd += $(LIBIDN2_LIBS)