Mercurial > mxe-octave

comparison src/gnutls-1-fixes.patch @ 2748:3dc2260fa84d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package gnutls: automake 1.12 compatibility
author Mark Brand <mabrand@mabrand.nl>
date Thu, 20 Sep 2012 11:48:55 +0200
parents 99516e73b368
children 1a91124dd342
comparison
equal deleted inserted replaced
2747:1d1285b1f6a0 2748:3dc2260fa84d
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 6 From 2192552e7e1321b985803eca20a433c19b9384d1 Mon Sep 17 00:00:00 2001
7 From: MXE 7 From: Mark Brand <mabrand@mabrand.nl>
8 Date: Fri, 28 Oct 2011 09:23:41 +0200 8 Date: Fri, 28 Oct 2011 09:23:41 +0200
9 Subject: [PATCH 1/2] add missing static library linking 9 Subject: [PATCH 1/4] add missing static library linking
10 10
11 11
12 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in 12 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
13 index c45f8f3..57d0dbb 100644 13 index c45f8f3..57d0dbb 100644
14 --- a/lib/gnutls.pc.in 14 --- a/lib/gnutls.pc.in
20 -Libs.private: @LTLIBNETTLE@ 20 -Libs.private: @LTLIBNETTLE@
21 +Libs.private: @LTLIBNETTLE@ @LIBS@ 21 +Libs.private: @LTLIBNETTLE@ @LIBS@
22 @GNUTLS_REQUIRES_PRIVATE@ 22 @GNUTLS_REQUIRES_PRIVATE@
23 Cflags: -I${includedir} 23 Cflags: -I${includedir}
24 -- 24 --
25 1.7.9.2 25 1.7.10.4
26 26
27 27
28 From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 28 From b11d2c59f0c8793717d8c718c8d4836fcae86a2b Mon Sep 17 00:00:00 2001
29 From: MXE 29 From: Mark Brand <mabrand@mabrand.nl>
30 Date: Thu, 24 Nov 2011 15:06:06 +0100 30 Date: Thu, 24 Nov 2011 15:06:06 +0100
31 Subject: [PATCH 2/2] disable doc and test (MXE specific) 31 Subject: [PATCH 2/4] disable doc and test (MXE specific)
32 32
33 33
34 diff --git a/Makefile.am b/Makefile.am 34 diff --git a/Makefile.am b/Makefile.am
35 index 0afe4bd..da7436a 100644 35 index 0afe4bd..da7436a 100644
36 --- a/Makefile.am 36 --- a/Makefile.am
43 +SUBDIRS += src 43 +SUBDIRS += src
44 44
45 if HAVE_GUILE 45 if HAVE_GUILE
46 SUBDIRS += guile 46 SUBDIRS += guile
47 -- 47 --
48 1.7.9.2 48 1.7.10.4
49 49
50
51 From 49019993012db5eea6d9b3f37c4d2c9b4c619a8a Mon Sep 17 00:00:00 2001
52 From: Mark Brand <mabrand@mabrand.nl>
53 Date: Wed, 6 Jun 2012 09:57:24 +0200
54 Subject: [PATCH 3/4] AM_PROG_AR for automake 1.12 compatibility
55
56 Taken from
57 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
58
59 diff --git a/configure.ac b/configure.ac
60 index 83c3577..6e2897b 100644
61 --- a/configure.ac
62 +++ b/configure.ac
63 @@ -37,6 +37,7 @@ dnl Checks for programs.
64 AC_PROG_CC
65 AM_PROG_AS
66 AC_PROG_CXX
67 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
68 gl_EARLY
69
70 # For includes/gnutls/gnutls.h.in.
71 --
72 1.7.10.4
73
74
75 From 82e1e1d59d357dfdebbe88575a440d0d7675533d Mon Sep 17 00:00:00 2001
76 From: Mark Brand <mabrand@mabrand.nl>
77 Date: Wed, 18 Jul 2012 00:58:59 +0200
78 Subject: [PATCH 4/4] relax automake
79
80
81 diff --git a/configure.ac b/configure.ac
82 index 6e2897b..024d31e 100644
83 --- a/configure.ac
84 +++ b/configure.ac
85 @@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.17], [bug-gnutls@gnu.org])
86 AC_CONFIG_AUX_DIR([build-aux])
87 AC_CONFIG_MACRO_DIR([m4])
88
89 -AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
90 +AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Wno-override])
91 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
92 AM_CONFIG_HEADER(config.h)
93
94 --
95 1.7.10.4
96