Mercurial > mxe-octave

changeset 6428:11a3af7e5c3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
postgresql: update to v14.5 * src/postgresql-1-autoconf.patch: update patch * src/postgresql.mk: update version, use MAKELEVEL=0, update update rule for v14
author John Donoghue <john.donoghue@ieee.org>
date Mon, 26 Sep 2022 13:12:48 -0400
parents 152618b5b2a1
children b8de860872cd
files src/postgresql-1-autoconf.patch src/postgresql.mk
diffstat 2 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/postgresql-1-autoconf.patch	Mon Sep 26 10:50:33 2022 +0200
+++ b/src/postgresql-1-autoconf.patch	Mon Sep 26 13:12:48 2022 -0400
@@ -1,18 +1,18 @@
-diff -ur postgresql-9.4.26.orig/configure.in postgresql-9.4.26/configure.in
---- postgresql-9.4.26.orig/configure.in	2022-09-23 21:36:35.767240767 -0400
-+++ postgresql-9.4.26/configure.in	2022-09-23 21:36:59.182663392 -0400
+diff -ur postgresql-14.5.orig/configure.ac postgresql-14.5/configure.ac
+--- postgresql-14.5.orig/configure.ac	2022-09-24 08:31:28.243846882 -0400
++++ postgresql-14.5/configure.ac	2022-09-24 08:31:46.952668359 -0400
 @@ -19,10 +19,10 @@
  
- AC_INIT([PostgreSQL], [9.4.26], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [14.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
+-recommended.  You can remove the check from 'configure.ac' but it is then
 -your responsibility whether the result works or not.])])
 +#m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 +#Untested combinations of 'autoconf' and PostgreSQL versions are not
-+#recommended.  You can remove the check from 'configure.in' but it is then
++#recommended.  You can remove the check from 'configure.ac' but it is then
 +#your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
--- a/src/postgresql.mk	Mon Sep 26 10:50:33 2022 +0200
+++ b/src/postgresql.mk	Mon Sep 26 13:12:48 2022 -0400
@@ -3,8 +3,8 @@
 
 PKG             := postgresql
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9.4.26
-$(PKG)_CHECKSUM := 832094c944c57ac19ddcd552ada732a77609de75
+$(PKG)_VERSION  := 14.5
+$(PKG)_CHECKSUM := 3f2bb7d0b6d56f985fa5dfd2dd2675e7b6b2fef9
 $(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)
@@ -21,11 +21,11 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.postgresql.org/gitweb?p=postgresql.git;a=tags' | \
-    grep 'refs/tags/REL9[0-9_]*"' | \
-    $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \
+    grep 'refs/tags/REL_14[0-9_]*"' | \
+    $(SED) 's,.*refs/tags/REL_\(.*\)".*,\1,g;' | \
     $(SED) 's,_,.,g' | \
-    grep '^9\.4' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
@@ -55,11 +55,11 @@
         --with-zlib \
         --with-system-tzdata=/dev/null \
         LIBS="$($(PKG)_LIBS)"
-    $(MAKE) -C '$(1)'/src/common             -j '$(JOBS)'         
-    $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install DESTDIR='$(3)'
-    $(MAKE) -C '$(1)'/src/port             -j '$(JOBS)'         
-    $(MAKE) -C '$(1)'/src/bin/psql         -j '$(JOBS)' install DESTDIR='$(3)'
-    $(MAKE) -C '$(1)'/src/bin/pg_config    -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) MAKELEVEL=0 -C '$(1)'/src/common           -j '$(JOBS)'         
+    $(MAKE) MAKELEVEL=0 -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) MAKELEVEL=0 -C '$(1)'/src/port             -j '$(JOBS)'         
+    $(MAKE) MAKELEVEL=0 -C '$(1)'/src/bin/psql         -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) MAKELEVEL=0 -C '$(1)'/src/bin/pg_config    -j '$(JOBS)' install DESTDIR='$(3)'
     $(INSTALL) -m644 '$(1)/src/include/pg_config.h'    '$(3)$(HOST_INCDIR)'
     $(INSTALL) -m644 '$(1)/src/include/pg_config_ext.h' '$(3)$(HOST_INCDIR)'
     $(INSTALL) -m644 '$(1)/src/include/pg_config_os.h' '$(3)$(HOST_INCDIR)'
@@ -88,8 +88,8 @@
             --without-libxslt \
             --without-zlib \
             --with-system-tzdata=/dev/null; \
-        $(MAKE) -C '$(1).native'/src/port          -j '$(JOBS)'; \
-        $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install DESTDIR=$(3); \
+        $(MAKE) MAKELEVEL=0 -C '$(1).native'/src/port          -j '$(JOBS)'; \
+        $(MAKE) MAKELEVEL=0 -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install DESTDIR=$(3); \
         $(INSTALL) -m755 '$(3)$(BUILD_TOOLS_PREFIX)/bin/pg_config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \
     fi
 endef