Mercurial > mxe-octave

annotate src/gnutls-1-fixes.patch @ 2128:e54452862e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package gnutls: clean up -Replace echo and sed hacks -gai_strerror test seems to work now without hack. -Disable crywrap for Windows with configure logic. -Disable doc and tests targets with patch. -Improve handling of LIBS and .pc file -zlib is already in GNUTLS_REQUIRES_PRIVATE -Use LIBS to introduce -lws32_2 into Libs.private
author Mark Brand <mabrand@mabrand.nl>
date Thu, 24 Nov 2011 11:47:42 +0100
parents 8ad4a821fc50
children 579a86151bbc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1923
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
2128
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
6 From 1b8300eee68e9768ba628d51facf8183255a6e78 Mon Sep 17 00:00:00 2001
1923
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 From: mingw-cross-env
2057
8ad4a821fc50 upgrade package gnutls
Mark Brand <mabrand@mabrand.nl>
parents: 1953
diff changeset
8 Date: Fri, 28 Oct 2011 09:23:41 +0200
2128
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
9 Subject: [PATCH 1/3] add missing static library linking
1923
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
2128
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
13 index 32170b6..de032a2 100644
1923
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/lib/gnutls.pc.in
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/lib/gnutls.pc.in
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 URL: http://www.gnu.org/software/gnutls/
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 Version: @VERSION@
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 Libs: -L${libdir} -lgnutls
2057
8ad4a821fc50 upgrade package gnutls
Mark Brand <mabrand@mabrand.nl>
parents: 1953
diff changeset
20 -Libs.private: @LTLIBNETTLE@
2128
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
21 +Libs.private: @LTLIBNETTLE@ @LIBS@
1923
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 @GNUTLS_REQUIRES_PRIVATE@
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 Cflags: -I${includedir}
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 --
2128
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
25 1.7.7.3
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
26
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
27
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
28 From 84e79eadf2edae75ecb93792cf9899932b9d3a49 Mon Sep 17 00:00:00 2001
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
29 From: mingw-cross-env
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
30 Date: Thu, 24 Nov 2011 14:40:11 +0100
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
31 Subject: [PATCH 2/3] don't try to build crywrap for windows
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
32
1923
fb1d95da571b package gnutls: fixed .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33
2128
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
34 diff --git a/configure.ac b/configure.ac
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
35 index 028ffe4..9c183ae 100644
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
36 --- a/configure.ac
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
37 +++ b/configure.ac
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
38 @@ -431,7 +431,7 @@ AC_CHECK_FUNCS([alarm atexit dup2 epoll_create kqueue memchr memset munmap \
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
39
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
40 PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
41
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
42 -AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno")
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
43 +AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$have_win" != "xyes" && test "x$libidn" != "xno")
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
44
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
45 dnl end of crywrap requirements
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
46
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
47 --
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
48 1.7.7.3
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
49
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
50
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
51 From fc59afca0261a79ebca4898c6d70434a7f9895f7 Mon Sep 17 00:00:00 2001
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
52 From: mingw-cross-env
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
53 Date: Thu, 24 Nov 2011 15:06:06 +0100
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
54 Subject: [PATCH 3/3] disable doc and test (mingw-cross-env specific)
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
55
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
56
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
57 diff --git a/Makefile.am b/Makefile.am
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
58 index 14c2642..ec86896 100644
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
59 --- a/Makefile.am
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
60 +++ b/Makefile.am
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
61 @@ -21,7 +21,7 @@
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
62
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
63 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
64
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
65 -SUBDIRS = gl lib extra po src doc tests
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
66 +SUBDIRS = gl lib extra po src
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
67
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
68 if HAVE_GUILE
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
69 SUBDIRS += guile
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
70 --
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
71 1.7.7.3
e54452862e8b package gnutls: clean up
Mark Brand <mabrand@mabrand.nl>
parents: 2057
diff changeset
72