[SCM] PostGIS branch master updated. 3.6.0rc1-31-g7c3829c39
git at osgeo.org
git at osgeo.org
Sun Aug 24 00:46:55 PDT 2025
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, master has been updated
via 7c3829c39ccf940302c52f44c9225da1ff750ed2 (commit)
via 93e9200a062eb7bc19024be0f58b7e47bb5544cf (commit)
via 3acef7da9c12e17496391b2fd8a10cb8dde0d052 (commit)
via ee15461766420913b0820f84b42299235a9994a7 (commit)
from 534dcbd601c826f13c4a8f6341c5d5ccd577be03 (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 7c3829c39ccf940302c52f44c9225da1ff750ed2
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 24 03:30:13 2025 -0400
Prepping for RC2
diff --git a/NEWS b/NEWS
index 0cc68d6b5..be2c04e53 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+PostGIS 3.6.0rc2
+2025/08/xx
+This version requires PostgreSQL 12-18beta3, GEOS 3.8 or higher, and Proj 6.1+.
+To take advantage of all features, GEOS 3.14+ is needed.
+To take advantage of all SFCGAL features, SFCGAL 2.2+ is needed.
+
+Many thanks to our translation teams, in particular:
+
+Teramoto Ikuhiro (Japanese Team)
+Daniel Nylander (Swedish Team)
+Dapeng Wang, Zuo Chenwei from HighGo (Chinese Team)
+Denys Kovshun (Ukrainian Team)
+
+CHANGES since PostGIS 3.6.0rc1
+
+ - Doc updates
+ - #5968, Remove raster generated files in distclean target (Bas Couwenberg)
+ - #5969, Fix issue when building --without-topology (Regina Obe)
+ - #5971, Option to build --without-tiger (Regina Obe)
+
+
PostGIS 3.6.0
2025/xx/xx
commit 93e9200a062eb7bc19024be0f58b7e47bb5544cf
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 24 03:29:42 2025 -0400
More cleanup of winnie scripts and ability to build with pcre2
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index f410e720e..20db15c43 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -48,10 +48,6 @@ git describe --long --all --tags # Report where we are at
sh autogen.sh
-if [ -n "$PCRE_VER" ]; then
- export PATH="${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
-fi
-
export LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/bin -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib"
if [$INCLUDE_MINOR_LIB == "1"]; then
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 27fda2311..bb4f1fc4c 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -107,7 +107,7 @@ if [ "$POSTGIS_MAJOR_VERSION" > "1" ] ; then
cp -rp ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal $outdir/gdal-data
# needed for address standardizer
- cp -p ${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/bin/libpcre-1*.dll $outdir/bin
+ cp -p ${PCRE_PATH}/bin/*.dll $outdir/bin
fi;
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index b6d26ece7..10aa48c0e 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -101,24 +101,29 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/lib -L${PROJECTS
make -j 4
make install
-make check RUNTESTFLAGS=-v
+
+# don't run tests twice. Only run regular if extension test is not asked for
+if [ "$MAKE_EXTENSION" == "" ]; then
+ make check RUNTESTFLAGS=-v
+fi
+
if [ "$MAKE_EXTENSION" == "1" ]; then
export PGUSER=postgres
#need to copy install files to EDB install (since not done by make install
cd ${POSTGIS_SRC}
echo "Postgis src dir is ${POSTGIS_SRC}"
- strip postgis/postgis-*.dll
- strip raster/rt_pg/postgis_raster-*.dll
- strip sfcgal/*.dll
+ #strip postgis/postgis-*.dll
+ #strip raster/rt_pg/postgis_raster-*.dll
+ #strip sfcgal/*.dll
- if [ $REGRESS_WITHOUT_TOPOLOGY == ""]; then
+ if [ $REGRESS_WITHOUT_TOPOLOGY == "" ]; then
cp -r topology/*.dll ${PGPATHEDB}/lib
fi
cp postgis/postgis*.dll ${PGPATHEDB}/lib
cp sfcgal/*.dll ${PGPATHEDB}/lib
- if [ $REGRESS_WITHOUT_RASTER == ""]; then
+ if [ $REGRESS_WITHOUT_RASTER == "" ]; then
cp raster/rt_pg/postgis_raster-*.dll ${PGPATHEDB}/lib
fi
diff --git a/ci/winnie/winnie_common.sh b/ci/winnie/winnie_common.sh
index b629ce201..e81b946f0 100644
--- a/ci/winnie/winnie_common.sh
+++ b/ci/winnie/winnie_common.sh
@@ -26,12 +26,25 @@ if [[ "${OVERRIDE}" == '' ]] ; then
export LZ4_VER=1.9.3
fi;
+if [[ ${PCRE_VER} == '' ]]; then
+ PCRE_VER=10.40
+fi;
+
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
export JSON_VER=0.12
-export PCRE_VER=8.45
+
+
+if [ -d "${PROJECTS}/pcre2/rel-pcre2-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}" ]; then
+export PCRE_PATH=${PROJECTS}/pcre2/rel-pcre2-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}
+else
+export PCRE_PATH=${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}
+fi
+
+
+echo "PCRE_PATH is $PCRE_PATH"
#export OS_BUILD=64
#export PGPORT=8442
@@ -123,7 +136,7 @@ export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/
export PATH="${PGPATH}/bin:${PGPATH}/lib:${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:${PROJ_PATH}/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}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJ_PATH}/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:/mingw/${MINGHOST}/lib/pkgconfig"
+export PKG_CONFIG_PATH="${PROJECTS}/sqlite/rel-sqlite3w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${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:${PROJ_PATH}/lib/pkgconfig:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PCRE_PATH}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:/mingw/${MINGHOST}/lib/pkgconfig"
export SHLIB_LINK="-static-libstdc++ -lstdc++ -Wl,-Bdynamic -lm"
CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include"
@@ -144,6 +157,11 @@ CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}
#add protobuf
export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
+# add pcre for address_standardizer
+if [ -n "$PCRE_PATH" ]; then
+ export PATH="${PCRE_PATH}/include:${PCRE_PATH}/lib:${PATH}"
+fi
+
echo "PATH AFTER: $PATH"
if [[ "${INCLUDE_MINOR_LIB}" == '' ]] ; then
commit 3acef7da9c12e17496391b2fd8a10cb8dde0d052
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 24 02:35:57 2025 -0400
- Add configure option --without-tiger to disable postgis_tiger_geocoder extension suport
- Add to docs and remove no longer valid line about postgis_topology not having a lib file
Closes #5971
diff --git a/configure.ac b/configure.ac
index ac2d805c0..61ab6bbf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1488,6 +1488,23 @@ fi
AC_SUBST([ADDRESS_STANDARDIZER])
+dnl ====================================
+dnl tiger_geocoder stuff
+dnl ====================================
+AC_ARG_WITH([tiger],
+ [AS_HELP_STRING([--without-tiger],
+ [Disable the tiger geocoder extension])],
+ [], [])
+
+if test "x$with_tiger" != "xno"; then
+ TIGER="tiger"
+ AC_MSG_RESULT([TIGER: Tiger geocoder support requested])
+else
+ AC_MSG_RESULT([TIGER: Tiger geocoder support disabled])
+fi
+
+AC_SUBST([TIGER])
+
CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $PROTOBUF_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $JSON_CPPFLAGS $PCRE_CPPFLAGS $CPPFLAGS"
dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
@@ -1529,7 +1546,6 @@ fi
AC_SUBST([INTERRUPTTESTS])
-
dnl ===========================================================================
dnl SRID stuff
dnl ===========================================================================
@@ -2028,6 +2044,12 @@ else
AC_MSG_RESULT([ Address Standardizer support: disabled])
fi
+if test "x$TIGER" = "xtiger"; then
+ AC_MSG_RESULT([ PostGIS Tiger Geocoder: enabled])
+else
+ AC_MSG_RESULT([ PostGIS Tiger Geocoder: disabled])
+fi
+
AC_MSG_RESULT()
AC_MSG_RESULT([ -------- Documentation Generation -------- ])
AC_MSG_RESULT([ xsltproc: ${XSLTPROC}])
diff --git a/doc/installation.xml b/doc/installation.xml
index 85bdfb3eb..e7ff09792 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -497,12 +497,19 @@ sh autogen.sh
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--without-tiger</option></term>
+ <listitem>
+ <para>
+ Disables tiger geocoder support.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><option>--without-topology</option></term>
<listitem>
<para>
- Disable topology support. There is no corresponding library
- as all logic needed for topology is in postgis-&last_release_version; library.
+ Compile without topology support.
</para>
</listitem>
</varlistentry>
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 6510dd82a..32a4c50a5 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -17,7 +17,10 @@ VPATH := $(srcdir)
SCRIPTS_BUILT = postgis_extension_helper.sql
SUBDIRS = postgis
-SUBDIRS += postgis_tiger_geocoder
+
+ifeq (@TIGER@,tiger)
+ SUBDIRS += postgis_tiger_geocoder
+endif
ifeq (@RASTER@,raster)
SUBDIRS += postgis_raster
endif
commit ee15461766420913b0820f84b42299235a9994a7
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 24 02:09:10 2025 -0400
Logic for winnie to conditionally compile with raster and topology
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 08e1759c3..b6d26ece7 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -68,6 +68,14 @@ if [ $INCLUDE_MINOR_LIB == "1" ]; then
EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --with-library-minor-version"
fi
+if [ $REGRESS_WITHOUT_TOPOLOGY == "1" ]; then
+ EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --without-topology"
+fi
+
+if [ $REGRESS_WITHOUT_RASTER == "1" ]; then
+ EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --without-raster"
+fi
+
#CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include" \
#CFLAGS="-Wall -fno-omit-frame-pointer"
@@ -83,7 +91,6 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/lib -L${PROJECTS
--with-gui --with-gettext=no \
--with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version \
- --without-topology \
${EXTRA_CONFIGURE_ARGS}
@@ -104,10 +111,17 @@ if [ "$MAKE_EXTENSION" == "1" ]; then
strip postgis/postgis-*.dll
strip raster/rt_pg/postgis_raster-*.dll
strip sfcgal/*.dll
- cp topology/*.dll ${PGPATHEDB}/lib
+
+ if [ $REGRESS_WITHOUT_TOPOLOGY == ""]; then
+ cp -r topology/*.dll ${PGPATHEDB}/lib
+ fi
cp postgis/postgis*.dll ${PGPATHEDB}/lib
cp sfcgal/*.dll ${PGPATHEDB}/lib
- cp raster/rt_pg/postgis_raster-*.dll ${PGPATHEDB}/lib
+
+ if [ $REGRESS_WITHOUT_RASTER == ""]; then
+ cp raster/rt_pg/postgis_raster-*.dll ${PGPATHEDB}/lib
+ fi
+
export POSTGIS_MINOR_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
export POSTGIS_MINOR_MAX_VER="ANY"
@@ -120,8 +134,20 @@ value=${value//UPGRADEABLE_VERSIONS = /}
#echo $value
export UPGRADEABLE_VERSIONS=$value
export WIN_RELEASED_VERSIONS="2.0.0 2.0.1 2.0.3 2.0.4 2.0.6 2.1.4 2.1.7 2.1.8 2.2.0 2.2.3 2.3.0 2.3.7 2.4.0 2.4.4"
+export extensions_to_install="postgis postgis_sfcgal postgis_tiger_geocoder address_standardizer"
+
+if [ $REGRESS_WITHOUT_TOPOLOGY == "" ]; then
+ extensions_to_install="${extensions_to_install} postgis_topology"
+fi
+
+if [ $REGRESS_WITHOUT_RASTER == "" ]; then
+ extensions_to_install="${extensions_to_install} postgis_raster"
+fi
+
+
#echo "Versions are: $UPGRADEABLE_VERSIONS"
-for EXTNAME in postgis postgis_raster postgis_sfcgal postgis_tiger_geocoder address_standardizer postgis_topology; do
+for EXTNAME in $extensions_to_install; do
+
cp extensions/$EXTNAME/sql/* ${PGPATHEDB}/share/extension
cp extensions/$EXTNAME/sql/$EXTNAME--TEMPLATED--TO--ANY.sql ${PGPATHEDB}/share/extension/$EXTNAME--$POSTGIS_MICRO_VER--${POSTGIS_MINOR_MAX_VER}.sql;
@@ -143,10 +169,10 @@ done
#cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
#cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}next.sql ${PGPATHEDB}/share/extension
#cp -r ${PGPATH}/share/extension/address_standardizer*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
- cp -r extensions/*/*.control ${PGPATHEDB}/share/extension
- cp -r extensions/*/*.dll ${PGPATHEDB}/lib
+cp -r extensions/*/*.control ${PGPATHEDB}/share/extension
+cp -r extensions/*/*.dll ${PGPATHEDB}/lib
- make check RUNTESTFLAGS="--extension -v"
+make check RUNTESTFLAGS="--extension -v"
if [ "$UPGRADE_TEST" == "1" ]; then
export CURRENTVERSION=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
-----------------------------------------------------------------------
Summary of changes:
NEWS | 21 ++++++++++++++++++
ci/winnie/build_postgis.sh | 4 ----
ci/winnie/package_postgis.sh | 2 +-
ci/winnie/regress_postgis.sh | 53 +++++++++++++++++++++++++++++++++++---------
ci/winnie/winnie_common.sh | 22 ++++++++++++++++--
configure.ac | 24 +++++++++++++++++++-
doc/installation.xml | 11 +++++++--
extensions/Makefile.in | 5 ++++-
8 files changed, 120 insertions(+), 22 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list