Mercurial > mxe-octave
annotate src/postgresql-1-fixes.patch @ 2722:cc9a2cdaa9d5
update package postgresql
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Tue, 11 Sep 2012 02:30:25 +0200 |
parents | 15746ee1cfd1 |
children | f20bbf45b91a |
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 |
2722 | 6 From 19c7eeda5108ff34f2c954fb974f06517ad01f7b Mon Sep 17 00:00:00 2001 |
2567 | 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 | 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 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
11 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 diff --git a/configure.in b/configure.in |
2722 | 13 index 4ea90f0..be9c1d9 100644 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
14 --- a/configure.in |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
15 +++ b/configure.in |
2722 | 16 @@ -926,13 +926,8 @@ fi |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
17 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 if test "$with_openssl" = yes ; then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 dnl Order matters! |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 - if test "$PORTNAME" != "win32"; then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
21 - 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
|
22 - 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
|
23 - else |
2259 | 24 - AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) |
25 - 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
|
26 - fi |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 + 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
|
28 + 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
|
29 fi |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
31 if test "$with_pam" = yes ; then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 -- |
2722 | 33 1.7.10.4 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
35 |
2722 | 36 From 6faf5d9d9431e71758aab37c27bb422fd933fabb Mon Sep 17 00:00:00 2001 |
2567 | 37 From: "a@a.org" <a@a.org> |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
38 Date: Mon, 24 Oct 2011 14:09:38 +0200 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
39 Subject: [PATCH 2/2] do not check autoconf version |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
40 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
41 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
42 diff --git a/configure.in b/configure.in |
2722 | 43 index be9c1d9..ee2f6bb 100644 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
44 --- a/configure.in |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
45 +++ b/configure.in |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 @@ -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
|
47 |
2722 | 48 AC_INIT([PostgreSQL], [9.2.0], [pgsql-bugs@postgresql.org]) |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
49 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
50 -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
|
51 -Untested combinations of 'autoconf' and PostgreSQL versions are not |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
52 -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
|
53 -your responsibility whether the result works or not.])]) |
2722 | 54 AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group]) |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
55 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
56 AC_CONFIG_AUX_DIR(config) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
57 -- |
2722 | 58 1.7.10.4 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
59 |