Mercurial > mxe-octave
annotate src/gnutls-1-fixes.patch @ 2389:d850f952f766
update package gnutls
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 03 Apr 2012 14:05:49 +0200 |
| parents | 99516e73b368 |
| children | 51a4ed33302d |
| 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 | |
| 2389 | 6 From ef8ca0b0c163a5fbca686a292890479c498607c8 Mon Sep 17 00:00:00 2001 |
| 7 From: Mark Brand <mabrand@mabrand.nl> | |
| 2057 | 8 Date: Fri, 28 Oct 2011 09:23:41 +0200 |
| 2389 | 9 Subject: [PATCH 1/3] add missing static library linking |
| 1923 | 10 |
| 2389 | 11 --- |
| 12 lib/gnutls.pc.in | 2 +- | |
| 13 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 1923 | 14 |
| 15 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | |
| 2246 | 16 index c45f8f3..57d0dbb 100644 |
| 1923 | 17 --- a/lib/gnutls.pc.in |
| 18 +++ b/lib/gnutls.pc.in | |
| 2246 | 19 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system |
| 1923 | 20 URL: http://www.gnu.org/software/gnutls/ |
| 21 Version: @VERSION@ | |
| 22 Libs: -L${libdir} -lgnutls | |
| 2057 | 23 -Libs.private: @LTLIBNETTLE@ |
| 2128 | 24 +Libs.private: @LTLIBNETTLE@ @LIBS@ |
| 1923 | 25 @GNUTLS_REQUIRES_PRIVATE@ |
| 26 Cflags: -I${includedir} | |
| 27 -- | |
| 2264 | 28 1.7.9.2 |
| 2128 | 29 |
| 1923 | 30 |
| 2389 | 31 From e90e7ac3a472b0bef5475966ac06d7f2f12c712b Mon Sep 17 00:00:00 2001 |
| 32 From: Mark Brand <mabrand@mabrand.nl> | |
| 2128 | 33 Date: Thu, 24 Nov 2011 15:06:06 +0100 |
| 2389 | 34 Subject: [PATCH 2/3] disable doc and test (mingw-cross-env specific) |
| 2128 | 35 |
| 2389 | 36 --- |
| 37 Makefile.am | 2 +- | |
| 38 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 2128 | 39 |
| 40 diff --git a/Makefile.am b/Makefile.am | |
| 2264 | 41 index 0afe4bd..da7436a 100644 |
| 2128 | 42 --- a/Makefile.am |
| 43 +++ b/Makefile.am | |
| 2246 | 44 @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests |
| 2128 | 45 |
| 2246 | 46 SUBDIRS = gl lib extra po |
| 2128 | 47 |
| 2246 | 48 -SUBDIRS += src doc tests |
| 49 +SUBDIRS += src | |
| 2128 | 50 |
| 51 if HAVE_GUILE | |
| 52 SUBDIRS += guile | |
| 53 -- | |
| 2264 | 54 1.7.9.2 |
| 55 | |
| 2389 | 56 |
| 57 From 5f92acf7123fed0e7a2c617a8abea48f00d83c19 Mon Sep 17 00:00:00 2001 | |
| 58 From: Mark Brand <mabrand@mabrand.nl> | |
| 59 Date: Tue, 3 Apr 2012 13:58:42 +0200 | |
| 60 Subject: [PATCH 3/3] Revert "make dist will also make lzip compressed | |
| 61 tarball" | |
| 62 | |
| 63 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. | |
| 64 --- | |
| 65 configure.ac | 2 +- | |
| 66 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 67 | |
| 68 diff --git a/configure.ac b/configure.ac | |
| 69 index ba60ce8..9af1253 100644 | |
| 70 --- a/configure.ac | |
| 71 +++ b/configure.ac | |
| 72 @@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.18], [bug-gnutls@gnu.org]) | |
| 73 AC_CONFIG_AUX_DIR([build-aux]) | |
| 74 AC_CONFIG_MACRO_DIR([m4]) | |
| 75 | |
| 76 -AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override]) | |
| 77 +AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) | |
| 78 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | |
| 79 AM_CONFIG_HEADER(config.h) | |
| 80 | |
| 81 -- | |
| 82 1.7.9.2 | |
| 83 |