diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-02-09 04:09:58 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-02-09 04:09:58 (GMT) |
| commit | fada0957e7357dc2f1041979f0c9b433afdb19aa (patch) | |
| tree | 0c51c54f756c466cb7cad2db3bc65ebbc40e7c6a /src | |
| parent | 3b51d4e90b3955fc9d4a712e7cc9ade532a0b7a4 (diff) | |
| parent | 5436cee47d95a1001e7fdf6ff167e79cf0b5ba95 (diff) | |
| download | mxe-fada0957e7357dc2f1041979f0c9b433afdb19aa.zip mxe-fada0957e7357dc2f1041979f0c9b433afdb19aa.tar.gz mxe-fada0957e7357dc2f1041979f0c9b433afdb19aa.tar.bz2 | |
Merge branch 'master' of github.com:mxe/mxe
Diffstat (limited to 'src')
| -rw-r--r-- | src/postgresql-1-fixes.patch | 10 | ||||
| -rw-r--r-- | src/postgresql.mk | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/postgresql-1-fixes.patch b/src/postgresql-1-fixes.patch index c94120b..8a06f73 100644 --- a/src/postgresql-1-fixes.patch +++ b/src/postgresql-1-fixes.patch @@ -3,14 +3,14 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 494e5750567b3bf897615d2ca1f368b1e3add093 Mon Sep 17 00:00:00 2001 +From b69ebe2d2df8a8fd2569f7fc5a37842af2af9cc2 Mon Sep 17 00:00:00 2001 From: "a@a.org" <a@a.org> Date: Mon, 24 Oct 2011 14:02:33 +0200 Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env diff --git a/configure.in b/configure.in -index af99340..cd80bbc 100644 +index 82a535e..4639101 100644 --- a/configure.in +++ b/configure.in @@ -926,13 +926,8 @@ fi @@ -33,19 +33,19 @@ index af99340..cd80bbc 100644 1.7.10.4 -From 2f790f5e10c26ac26a5eecfb23f6fbd06fa50eea Mon Sep 17 00:00:00 2001 +From d7f5abe97d30b7a94ea8a89173e1eeeb38f7666d Mon Sep 17 00:00:00 2001 From: "a@a.org" <a@a.org> Date: Mon, 24 Oct 2011 14:09:38 +0200 Subject: [PATCH 2/2] do not check autoconf version diff --git a/configure.in b/configure.in -index cd80bbc..a2cf7a8 100644 +index 4639101..5a26aa5 100644 --- a/configure.in +++ b/configure.in @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [9.2.2], [pgsql-bugs@postgresql.org]) + AC_INIT([PostgreSQL], [9.2.3], [pgsql-bugs@postgresql.org]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/src/postgresql.mk b/src/postgresql.mk index 7b8dcec..03ddeaa 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -3,7 +3,7 @@ PKG := postgresql $(PKG)_IGNORE := -$(PKG)_CHECKSUM := edadf238bcf51bd6e92dfe2f8afb3665510297a6 +$(PKG)_CHECKSUM := fe46685c36f6a7a04edd67be5695b4f5acebedff $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) |