From 42b0cb55e483eee2b7347c5941732c23ef8bdff7 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 14 Sep 2015 17:57:10 +1000 Subject: gnutls: remove unnecessary configure modifications * libopts_cv_with_libregex=no is not in ./configure * dist-lzip isn't used by MXE, but can be worked around with the make variables DIST_ARCHIVES and DIST_TARGETS Fixes #849 --- src/gnutls-1-fixes.patch | 89 ++++++------------------------------------------ src/gnutls.mk | 4 --- 2 files changed, 10 insertions(+), 83 deletions(-) diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index 325a69d..d8f1bca 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -1,58 +1,12 @@ This file is part of MXE. See index.html for further information. -From dfe54cbfbcff8b46285819ed38ddb5757d27a716 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Tue, 3 Apr 2012 13:58:42 +0200 -Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball" +Contains ad hoc patches for cross building. -This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. - -diff --git a/configure.ac b/configure.ac -index 3f7ec24..ef9fd77 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_HOST - --AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AC_CONFIG_HEADERS([config.h]) - --- -2.1.4 - - -From 5dc32c442c74e905a3d5199e658c77b6de44cde1 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Wed, 6 Jun 2012 09:57:24 +0200 -Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility - -Taken from -http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html - -diff --git a/configure.ac b/configure.ac -index ef9fd77..7c3436a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,6 +42,7 @@ ggl_EARLY - AM_PROG_AS - AM_PROG_AR - AC_PROG_CXX -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - AM_PROG_CC_C_O - AC_PROG_YACC - AC_PROG_SED --- -2.1.4 - - -From ab7fa52f69829b65e693723fade982cf372d5f27 Mon Sep 17 00:00:00 2001 -From: Mark Brand +From 239dc102017197025ef37cda8fa26b3750f18fb9 Mon Sep 17 00:00:00 2001 +From: MXE Date: Mon, 4 Feb 2013 16:11:12 +0100 -Subject: [PATCH 3/5] add missing private lib to pc file +Subject: [PATCH 1/2] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in @@ -68,36 +22,13 @@ index a25fcdf..3860c68 100644 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -2.1.4 - - -From a4ef8a481bee4ddd1102138d2e304595c5eb1828 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -Date: Wed, 6 Feb 2013 08:43:43 +0100 -Subject: [PATCH 4/5] relax automake version check - - -diff --git a/configure.ac b/configure.ac -index 7c3436a..406db3a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_HOST - --AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.11.1 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AC_CONFIG_HEADERS([config.h]) - --- -2.1.4 +2.3.2 (Apple Git-55) -From 2314330147f966d2dcd192b73dff822533ccab4e Mon Sep 17 00:00:00 2001 -From: Mark Brand +From 02e79ee0c18ff148e315c223675370ad11673bf6 Mon Sep 17 00:00:00 2001 +From: MXE Date: Mon, 24 Nov 2014 08:56:48 +0100 -Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop +Subject: [PATCH 2/2] windows build fix: ws2tcpip.h supplies inet_ntop Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a @@ -106,7 +37,7 @@ Signed-off-by: Mark Brand taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html diff --git a/lib/x509/output.c b/lib/x509/output.c -index 5cef68c..96ad795 100644 +index e82fe84..2e62418 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c @@ -34,7 +34,11 @@ @@ -123,5 +54,5 @@ index 5cef68c..96ad795 100644 #define addf _gnutls_buffer_append_printf -- -2.1.4 +2.3.2 (Apple Git-55) diff --git a/src/gnutls.mk b/src/gnutls.mk index 3ece6e7..62f0cce 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -18,10 +18,6 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' - cd '$(1)' && autoreconf -fi -I m4 -I gl/m4 -I src/libopts/m4 - # skip the run test for libregex support since we are cross compiling - $(SED) -i 's/libopts_cv_with_libregex=no/libopts_cv_with_libregex=yes/g;' '$(1)/configure' # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw. # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx cd '$(1)' && ./configure \ -- cgit v0.12