Mercurial > mxe-octave
annotate src/gnutls-1-fixes.patch @ 2821:0ddfaea74200
update package gnutls
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Fri, 12 Oct 2012 20:23:29 +0200 |
| parents | a57beaebd22a |
| children | cce4bedf4c3d |
| rev | line source |
|---|---|
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2285
diff
changeset
|
1 This file is part of MXE. |
|
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
| 1923 | 3 |
| 4 Contains ad hoc patches for cross building. | |
| 5 | |
| 2821 | 6 From de80b70d5d0e687d9c07f5ca270bb2ceb93d4dfa Mon Sep 17 00:00:00 2001 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
7 From: Mark Brand <mabrand@mabrand.nl> |
| 2057 | 8 Date: Fri, 28 Oct 2011 09:23:41 +0200 |
| 2790 | 9 Subject: [PATCH 1/6] add missing static library linking |
| 1923 | 10 |
| 11 | |
| 12 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | |
| 2246 | 13 index c45f8f3..57d0dbb 100644 |
| 1923 | 14 --- a/lib/gnutls.pc.in |
| 15 +++ b/lib/gnutls.pc.in | |
| 2246 | 16 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system |
| 1923 | 17 URL: http://www.gnu.org/software/gnutls/ |
| 18 Version: @VERSION@ | |
| 19 Libs: -L${libdir} -lgnutls | |
| 2057 | 20 -Libs.private: @LTLIBNETTLE@ |
| 2128 | 21 +Libs.private: @LTLIBNETTLE@ @LIBS@ |
| 1923 | 22 @GNUTLS_REQUIRES_PRIVATE@ |
| 23 Cflags: -I${includedir} | |
| 24 -- | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
25 1.7.10.4 |
| 2128 | 26 |
| 1923 | 27 |
| 2821 | 28 From 69da51d8c6b8720503a8b6220baf6a653d3e77b0 Mon Sep 17 00:00:00 2001 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
29 From: Mark Brand <mabrand@mabrand.nl> |
| 2128 | 30 Date: Thu, 24 Nov 2011 15:06:06 +0100 |
| 2790 | 31 Subject: [PATCH 2/6] disable doc and test (mingw-cross-env specific) |
| 2128 | 32 |
| 33 | |
| 34 diff --git a/Makefile.am b/Makefile.am | |
| 2821 | 35 index 74208b1..c46e900 100644 |
| 2128 | 36 --- a/Makefile.am |
| 37 +++ b/Makefile.am | |
| 2246 | 38 @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests |
| 2128 | 39 |
| 2821 | 40 SUBDIRS = gl lib extra libdane po |
| 2128 | 41 |
| 2246 | 42 -SUBDIRS += src doc tests |
| 43 +SUBDIRS += src | |
| 2128 | 44 |
| 45 if HAVE_GUILE | |
| 46 SUBDIRS += guile | |
| 47 -- | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
48 1.7.10.4 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
49 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
50 |
| 2821 | 51 From 50868df9034b6e8ad459363edaca1436794e7212 Mon Sep 17 00:00:00 2001 |
| 2389 | 52 From: Mark Brand <mabrand@mabrand.nl> |
| 53 Date: Tue, 3 Apr 2012 13:58:42 +0200 | |
| 2790 | 54 Subject: [PATCH 3/6] Revert "make dist will also make lzip compressed |
| 2389 | 55 tarball" |
| 56 | |
| 57 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. | |
| 58 | |
| 59 diff --git a/configure.ac b/configure.ac | |
| 2821 | 60 index 8d337ee..8c0a76e 100644 |
| 2389 | 61 --- a/configure.ac |
| 62 +++ b/configure.ac | |
| 2821 | 63 @@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.3], [bug-gnutls@gnu.org]) |
| 2389 | 64 AC_CONFIG_AUX_DIR([build-aux]) |
| 65 AC_CONFIG_MACRO_DIR([m4]) | |
| 66 | |
| 2768 | 67 -AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override]) |
| 68 +AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) | |
| 2389 | 69 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
| 70 AM_CONFIG_HEADER(config.h) | |
| 71 | |
| 72 -- | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
73 1.7.10.4 |
| 2389 | 74 |
| 2570 | 75 |
| 2821 | 76 From 613dff6244621ad8eef5afdf38edc16f90a275a4 Mon Sep 17 00:00:00 2001 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
77 From: Mark Brand <mabrand@mabrand.nl> |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
78 Date: Wed, 6 Jun 2012 09:57:24 +0200 |
| 2790 | 79 Subject: [PATCH 4/6] AM_PROG_AR for automake 1.12 compatibility |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
80 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
81 Taken from |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
82 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html |
| 2264 | 83 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
84 diff --git a/configure.ac b/configure.ac |
| 2821 | 85 index 8c0a76e..14e6da2 100644 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
86 --- a/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
87 +++ b/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
88 @@ -37,6 +37,7 @@ dnl Checks for programs. |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
89 AC_PROG_CC |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
90 AM_PROG_AS |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
91 AC_PROG_CXX |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
92 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
93 gl_EARLY |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
94 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
95 # For includes/gnutls/gnutls.h.in. |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
96 -- |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
97 1.7.10.4 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
98 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
99 |
| 2821 | 100 From 37a6a85032d3ef7bb4ec05c106da01b2354778f4 Mon Sep 17 00:00:00 2001 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
101 From: Mark Brand <mabrand@mabrand.nl> |
| 2768 | 102 Date: Thu, 16 Aug 2012 11:13:47 +0200 |
| 2790 | 103 Subject: [PATCH 5/6] allow automake warnings not to be errors |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
104 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
105 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
106 diff --git a/configure.ac b/configure.ac |
| 2821 | 107 index 14e6da2..0e427ce 100644 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
108 --- a/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
109 +++ b/configure.ac |
| 2821 | 110 @@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.3], [bug-gnutls@gnu.org]) |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
111 AC_CONFIG_AUX_DIR([build-aux]) |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
112 AC_CONFIG_MACRO_DIR([m4]) |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
113 |
| 2768 | 114 -AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) |
| 115 +AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Wno-override]) | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
116 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
117 AM_CONFIG_HEADER(config.h) |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
118 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
119 -- |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
120 1.7.10.4 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
121 |
| 2768 | 122 |
| 2821 | 123 From a1907c3679fc845ac5b241d25c86fb1106f63f84 Mon Sep 17 00:00:00 2001 |
| 2768 | 124 From: Mark Brand <mabrand@mabrand.nl> |
| 125 Date: Thu, 20 Sep 2012 12:59:19 +0200 | |
| 2790 | 126 Subject: [PATCH 6/6] add missing libs to Libs.private |
| 2768 | 127 |
| 128 | |
| 129 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | |
| 130 index 57d0dbb..02a6ef7 100644 | |
| 131 --- a/lib/gnutls.pc.in | |
| 132 +++ b/lib/gnutls.pc.in | |
| 133 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system | |
| 134 URL: http://www.gnu.org/software/gnutls/ | |
| 135 Version: @VERSION@ | |
| 136 Libs: -L${libdir} -lgnutls | |
| 137 -Libs.private: @LTLIBNETTLE@ @LIBS@ | |
| 138 +Libs.private: @LTLIBNETTLE@ @LIBS@ -lcrypt32 -lws2_32 | |
| 139 @GNUTLS_REQUIRES_PRIVATE@ | |
| 140 Cflags: -I${includedir} | |
| 141 -- | |
| 142 1.7.10.4 | |
| 143 |