Mercurial > mxe-octave

annotate src/postgresql-1-fixes.patch @ 2567:203c9a62062c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package postgresql
author Mark Brand <mabrand@mabrand.nl>
date Mon, 04 Jun 2012 22:33:51 +0200
parents 99516e73b368
children 15746ee1cfd1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2259
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.
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
6 From 43bdcd7403f7e58f4da47a84a324ee02f80ba4c9 Mon Sep 17 00:00:00 2001
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
7 From: "a@a.org" <a@a.org>
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Mon, 24 Oct 2011 14:02:33 +0200
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
9 Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
11 ---
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
12 configure.in | 9 ++-------
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
13 1 file changed, 2 insertions(+), 7 deletions(-)
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 diff --git a/configure.in b/configure.in
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
16 index ff0063d..c64b88e 100644
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 --- a/configure.in
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 +++ b/configure.in
2259
aa6e4ec5cf05 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2047
diff changeset
19 @@ -943,13 +943,8 @@ fi
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 if test "$with_openssl" = yes ; then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 dnl Order matters!
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 - if test "$PORTNAME" != "win32"; then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 - AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 - AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 - else
2259
aa6e4ec5cf05 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2047
diff changeset
27 - AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
aa6e4ec5cf05 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2047
diff changeset
28 - AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 - fi
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 + AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 + AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 fi
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 if test "$with_pam" = yes ; then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 --
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
36 1.7.9.2
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
39 From fc01a0853f56b3ce377e0b5fd461e3ee8a89877d Mon Sep 17 00:00:00 2001
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
40 From: "a@a.org" <a@a.org>
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 Date: Mon, 24 Oct 2011 14:09:38 +0200
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 Subject: [PATCH 2/2] do not check autoconf version
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
44 ---
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
45 configure.in | 4 ----
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
46 1 file changed, 4 deletions(-)
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 diff --git a/configure.in b/configure.in
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
49 index c64b88e..ee52a70 100644
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 --- a/configure.in
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 +++ b/configure.in
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
54 AC_INIT([PostgreSQL], [9.1.4], [pgsql-bugs@postgresql.org])
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 -Untested combinations of 'autoconf' and PostgreSQL versions are not
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 -recommended. You can remove the check from 'configure.in' but it is then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 -your responsibility whether the result works or not.])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 AC_CONFIG_AUX_DIR(config)
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 --
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
64 1.7.9.2
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65