Mercurial > mxe-octave

changeset 3393:166294cad9f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update postqresql to 9.2.4 from mxe_devel repo * index.hml: set postgresql-version=9.2.4 * src/postgresql-1-fixes.patch: update patch from mxe_devel repo. * src/postgresql.mk: update checksum and installed include files.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 03 Jan 2014 15:08:08 -0500
parents 3010314a9747
children 83a5cb70a800
files index.html src/postgresql-1-fixes.patch src/postgresql.mk
diffstat 3 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Fri Jan 03 14:05:33 2014 -0500
+++ b/index.html	Fri Jan 03 15:08:08 2014 -0500
@@ -2164,7 +2164,7 @@
     </tr>
     <tr>
         <td id="postgresql-package">postgresql</td>
-        <td id="postgresql-version">9.2.1</td>
+        <td id="postgresql-version">9.2.4</td>
         <td id="postgresql-website"><a href="http://www.postgresql.org/">PostgreSQL</a></td>
     </tr>
     <tr>
--- a/src/postgresql-1-fixes.patch	Fri Jan 03 14:05:33 2014 -0500
+++ b/src/postgresql-1-fixes.patch	Fri Jan 03 15:08:08 2014 -0500
@@ -3,14 +3,14 @@
 
 Contains ad hoc patches for cross building.
 
-From 97675e8569c5eb6a13a044b52cb31a120ff61d26 Mon Sep 17 00:00:00 2001
+From 35d61378829a8cd151084184ebd55de1b074b324 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 1024b0d..710ad0c 100644
+index 2f8bb3d..441b42b 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -926,13 +926,8 @@ fi
@@ -30,22 +30,22 @@
  
  if test "$with_pam" = yes ; then
 -- 
-1.7.10.4
+1.8.1.4
 
 
-From cf2e7bb8d924354cba299ac26b8128b6fb234505 Mon Sep 17 00:00:00 2001
+From 48f27fc5b79373e696cd8db2a5195d9efc084c13 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 710ad0c..8acc307 100644
+index 441b42b..1257071 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.1], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.2.4], [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
@@ -55,5 +55,5 @@
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
 -- 
-1.7.10.4
+1.8.1.4
 
--- a/src/postgresql.mk	Fri Jan 03 14:05:33 2014 -0500
+++ b/src/postgresql.mk	Fri Jan 03 15:08:08 2014 -0500
@@ -3,7 +3,7 @@
 
 PKG             := postgresql
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := cea9601b3acd1484fd98441b49a15ea1c42057ec
+$(PKG)_CHECKSUM := 75b53c884cb10ed9404747b51677358f12082152
 $(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)
@@ -34,7 +34,7 @@
         $($(PKG)_CONFIGURE_FLAGS_OPTION) \
         --prefix='$(HOST_PREFIX)' \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --enable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --disable-rpath \
         --without-tcl \
         --without-perl \
@@ -57,6 +57,8 @@
     $(MAKE) -C '$(1)'/src/bin/psql         -j '$(JOBS)' install haslibarule=
     $(INSTALL) -m644 '$(1)/src/include/pg_config.h'    '$(HOST_INCDIR)'
     $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_INCDIR)'
+    $(INSTALL) -d    '$(HOST_INCDIR)/libpq'
+    $(INSTALL) -m644 '$(1)'/src/include/libpq/*        '$(HOST_INCDIR)/libpq/'
     # Build a native pg_config.
     $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile
     cd '$(1).native' && ./configure \