[postgis-tickets] [SCM] PostGIS branch stable-3.4 updated. 3.4.0rc2-5-g03dbb4758
git at osgeo.org
git at osgeo.org
Sun Aug 13 20:12:14 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-3.4 has been updated
via 03dbb4758bcb4df63c872f5d99f6f408726ce3f9 (commit)
via 225468c858018d04cb9f63cd621e78cb626a7a5c (commit)
via 6fe8245b941b1358128b305b330512ac934a4373 (commit)
from 3789186fb8645a0131dac6af53735287ebd5f133 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 03dbb4758bcb4df63c872f5d99f6f408726ce3f9
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 13 23:10:04 2023 -0400
MKDIR_P only override if it's not empty
Closes #5469 for PostGIS 3.4.0rc3
Closes #5476 for PostGIS 3.4.0rc3
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 31fca2d2f..44fcece78 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -205,7 +205,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifdef @MKDIR_P@
+ MKDIR_P = @MKDIR_P@
+endif
srcdir = @srcdir@
top_srcdir = @top_srcdir@
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 4723145c9..518292e7f 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -149,7 +149,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifdef @MKDIR_P@
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 2842aad38..e3404014b 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -131,7 +131,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifdef @MKDIR_P@
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 7fea079f5..d127ddda8 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -103,7 +103,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifdef @MKDIR_P@
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 3c18ee7b6..5e4baa633 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -214,7 +214,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL=@PERL@
-MKDIR_P = @MKDIR_P@
+ifdef @MKDIR_P@
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 75ba45c85..553182d2d 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -108,7 +108,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL=@PERL@
-MKDIR_P = @MKDIR_P@
+ifdef @MKDIR_P@
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
commit 225468c858018d04cb9f63cd621e78cb626a7a5c
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 13 23:07:45 2023 -0400
Put in news the two new configure switches
- --disable-extension-upgrades-install
- --without-pgconfig
diff --git a/NEWS b/NEWS
index 270fb28c1..acfaa8e53 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,11 @@ Many thanks to our translation teams, in particular:
Teramoto Ikuhiro (Japanese Team)
Vincent Bre (French Team)
+There are 2 new ./configure switches:
+
+ - --disable-extension-upgrades-install, will skip installing all the extension upgrade scripts except for the ANY--currentversion. If you use this, you can install select upgrades using the postgis commandline tool
+ - --without-pgconfig, will build just the commandline tools
+ raster2pgsql and shp2pgsql even if PostgreSQL is not installed
* New Features *
- #5055, complete manual internationalization (Sandro Santilli)
diff --git a/doc/release_notes.xml b/doc/release_notes.xml
index 897382c26..9f804e5d3 100644
--- a/doc/release_notes.xml
+++ b/doc/release_notes.xml
@@ -4,7 +4,7 @@
<subtitle>Release Notes</subtitle>
<sect1>
<title>PostGIS 3.4.0</title>
- <para>2023/08/13</para>
+ <para>2023/08/15</para>
<para>This version requires PostgreSQL 12 or higher, GEOS 3.6 or higher, and Proj 6.1+.
To take advantage of all features, GEOS 3.12+ is needed.
To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.</para>
@@ -13,6 +13,11 @@
<para>Teramoto Ikuhiro (Japanese Team)</para>
<para>Vincent Bre (French Team)</para>
+ <para>There are 2 new ./configure switches:</para>
+ <itemizedlist><listitem><para>--disable-extension-upgrades-install, will skip installing all the extension upgrade scripts except for the ANY--currentversion. If you use this, you can install select upgrades using the postgis commandline tool</para></listitem>
+ <listitem><para>--without-pgconfig, will build just the commandline tools raster2pgsql and shp2pgsql even if PostgreSQL is not installed</para></listitem>
+ </itemizedlist>
+
<simplesect>
<title>New features</title>
<para><ulink url="https://trac.osgeo.org/postgis/ticket/5055">5055</ulink>, complete manual internationalization (Sandro Santilli)</para>
commit 6fe8245b941b1358128b305b330512ac934a4373
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 13 22:33:19 2023 -0400
Winnie build changes:
- Standardize on 0 or 1 for INCLUDE_MINOR_LIB
- Set tagged builds to always be INCLUDE_MINOR_LIB=0
Others will default to INCLUDE_MINOR_LIB=1 or can be overwritten
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 82e6e1fbb..24efa2044 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -1,7 +1,6 @@
#!/usr/bin/env bash
. $(dirname $0)/winnie_common.sh
-export INCLUDE_MINOR_LIB=1
if [ -n "$SOURCE_FOLDER" ]; then
export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
@@ -12,7 +11,7 @@ else
else
#tagged version -- official release
export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
- INCLUDE_MINOR_LIB=false
+ INCLUDE_MINOR_LIB=0
fi;
fi;
diff --git a/ci/winnie/winnie_common.sh b/ci/winnie/winnie_common.sh
index c01b9a1d5..fe6b52fef 100644
--- a/ci/winnie/winnie_common.sh
+++ b/ci/winnie/winnie_common.sh
@@ -126,7 +126,7 @@ export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
#add lz4
export PATH="${LZ4_PATH}/bin:${LZ4_PATH}/lib:${PATH}"
-echo $PATH
+echo $PATH
export PATH="${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
export PKG_CONFIG_PATH="${PROJECTS}/sqlite/rel-sqlite3w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${LZ4_PATH}/lib/pkgconfig"
@@ -138,6 +138,6 @@ export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin
echo "PATH AFTER: $PATH"
-if [[ "${INCLUDE_MINOR_LIB}" == '' ]] ; then
- export INCLUDE_MINOR_LIB=true
+if [[ "${INCLUDE_MINOR_LIB}" == "" ]] ; then
+ export INCLUDE_MINOR_LIB=1
fi;
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 +++++
ci/winnie/build_postgis.sh | 3 +--
ci/winnie/winnie_common.sh | 6 +++---
doc/release_notes.xml | 7 ++++++-
extensions/address_standardizer/Makefile.in | 4 +++-
extensions/postgis/Makefile.in | 4 +++-
extensions/postgis_raster/Makefile.in | 4 +++-
extensions/postgis_sfcgal/Makefile.in | 4 +++-
extensions/postgis_tiger_geocoder/Makefile.in | 4 +++-
extensions/postgis_topology/Makefile.in | 4 +++-
10 files changed, 33 insertions(+), 12 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list