[SCM] PostGIS branch stable-3.5 updated. 3.5.4-3-g949a623cd
git at osgeo.org
git at osgeo.org
Thu Oct 30 06:00:15 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, stable-3.5 has been updated
via 949a623cd0afc9802ebb228d8dc7b477272b9b18 (commit)
from 66694dc2c2bad48c80f8230e091e616ce74ff07f (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 949a623cd0afc9802ebb228d8dc7b477272b9b18
Author: Regina Obe <lr at pcorp.us>
Date: Thu Oct 30 09:00:02 2025 -0400
Fix up winnie scripts to handle conditional install of postgis raster and postgis topology extensions during regress
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 13af0b6f2..bcaa2435e 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -12,7 +12,7 @@ DWN=${WEB}/download
#export PG_VER=9.2beta2
if [ -n "$SOURCE_FOLDER" ]; then
- export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
+ export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
cd $POSTGIS_SRC
fi
@@ -47,46 +47,54 @@ mkdir -p $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
mkdir -p $outdir/share/extension
mkdir $outdir/bin
mkdir $outdir/lib
-mkdir $outdir/bin/postgisgui
-mkdir $outdir/bin/postgisgui/share
-mkdir $outdir/bin/postgisgui/lib
+
mkdir $outdir/utils
-cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
-
-cp ${PGPATH}/bin/libpq.dll $outdir/bin/postgisgui
-#cp ${PGPATHEDB}/bin/libiconv2.dll $outdir/bin/postgisgui
-cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
-cp ${PGPATHEDB}/bin/libintl*.dll $outdir/bin/postgisgui
-
-#cp ${PGPATHEDB}/bin/ssleay32.dll $outdir/bin/postgisgui
-#cp ${PGPATHEDB}/bin/libeay32.dll $outdir/bin/postgisgui
-#cp ${PGPATHEDB}/bin/libcrypto-1_1-x64.dll $outdir/bin/postgisgui
-#cp ${PGPATHEDB}/bin/libssl-1_1-x64.dll $outdir/bin/postgisgui
-
-#pg 15 is shipping with newer ssl
-cp ${PGPATHEDB}/bin/libcrypto-3-x64.dll $outdir/bin/postgisgui
-cp ${PGPATHEDB}/bin/libssl-3-x64.dll $outdir/bin/postgisgui
cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libstdc++-6.dll $outdir/bin
cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libgcc*.dll $outdir/bin
-cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
-cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libstdc++-6.dll $outdir/bin/postgisgui
-cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libgcc*.dll $outdir/bin/postgisgui
-cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/etc $outdir/bin/postgisgui
-cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/share/themes $outdir/bin/postgisgui/share
-cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/gtk-2.0 $outdir/bin/postgisgui/lib
-cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui/lib
-cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/gdk-pixbuf-2.0 $outdir/bin/postgisgui/lib
+
+# don't package postgisgui if we don't have gtk2
+if [ -d "${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}" ]; then
+ mkdir $outdir/bin/postgisgui
+ mkdir $outdir/bin/postgisgui/share
+ mkdir $outdir/bin/postgisgui/lib
+ #pg 15 is shipping with newer ssl
+ cp ${PGPATHEDB}/bin/libcrypto-3-x64.dll $outdir/bin/postgisgui
+ cp ${PGPATHEDB}/bin/libssl-3-x64.dll $outdir/bin/postgisgui
+ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
+ cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libstdc++-6.dll $outdir/bin/postgisgui
+ cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libgcc*.dll $outdir/bin/postgisgui
+ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/etc $outdir/bin/postgisgui
+ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/share/themes $outdir/bin/postgisgui/share
+ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/gtk-2.0 $outdir/bin/postgisgui/lib
+ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui/lib
+ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/gdk-pixbuf-2.0 $outdir/bin/postgisgui/lib
+ cp ${PGPATHEDB}/bin/libintl*.dll $outdir/bin/postgisgui
+ cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
+
+ cp ${PGPATH}/bin/libpq.dll $outdir/bin/postgisgui
+ #cp ${PGPATHEDB}/bin/libiconv2.dll $outdir/bin/postgisgui
+ cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
+ #proj
+ cp ${PROJ_PATH}/bin/*.dll $outdir/bin/postgisgui
+ #geos
+ cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
+
+ cp loader/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
+ cp loader/.libs/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
+
+ #shp2pgsql-gui now has dependency on geos (though in theory it shouldn't)
+ cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
+fi;
# proj
cp ${PROJ_LIB}/* $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
cp ${PROJ_PATH}/bin/*.dll $outdir/bin
-cp ${PROJ_PATH}/bin/*.dll $outdir/bin/postgisgui
+
# geos
cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
-cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
#for protobuf
cp ${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin/libprotobuf-c-*.dll $outdir/bin
@@ -99,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;
@@ -116,8 +124,6 @@ if [ -n "$SFCGAL_VER" ]; then
#cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin
- # cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
- # cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui
fi;
echo "PROTOBUF VERSION: ${PROTOBUF_VER} https://github.com/google/protobuf" >> $verfile
@@ -147,14 +153,10 @@ cp loader/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
cp loader/.libs/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
cp loader/pgsql2shp.exe ${RELDIR}/${RELVERDIR}/bin
cp loader/.libs/pgsql2shp.exe ${RELDIR}/${RELVERDIR}/bin
-cp loader/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
-cp loader/.libs/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
cp topology/loader/* ${RELDIR}/${RELVERDIR}/bin
#cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
-#shp2pgsql-gui now has dependency on geos (though in theory it shouldn't)
-cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
cp spatial_ref_sys.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp topology/topology.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
#cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 19d49335e..5a86e8db9 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -39,10 +39,10 @@ echo PATH AFTER: $PATH
echo WORKSPACE IS $WORKSPACE
#mkdir ${PROJECTS}/postgis/tmp
-export PGIS_REG_TMPDIR=${PROJECTS}/postgis/tmp/${POSTGIS_MICRO_VER}_pg${PG_VER}_geos${GEOS_VER}_gdal${GDAL_VER}w${OS_BUILD}
-rm -rf ${PGIS_REG_TMPDIR}
-mkdir ${PGIS_REG_TMPDIR}
-export TMPDIR=${PGIS_REG_TMPDIR}
+#export PGIS_REG_TMPDIR=${PROJECTS}/postgis/tmp/${POSTGIS_MICRO_VER}_pg${PG_VER}_geos${GEOS_VER}_gdal${GDAL_VER}w${OS_BUILD}
+#rm -rf ${PGIS_REG_TMPDIR}
+#mkdir ${PGIS_REG_TMPDIR}
+#export TMPDIR=${PGIS_REG_TMPDIR}
#rm -rf ${PGIS_REG_TMPDIR}
#TMPDIR=${PROJECTS}/postgis/tmp/${POSTGIS_VER}_${PG_VER}_${GEOS_VERSION}_${PROJ_VER}
@@ -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"
@@ -91,22 +99,34 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/lib -L${PROJECTS
#patch liblwgeom generated make to get rid of dynamic linking
#sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
-make -j 4
+make -j 2
make install
-make check RUNTESTFLAGS=-v
+
+# don't run tests twice. Only run regular if extension test is not asked for
+if [ "$MAKE_EXTENSION" == "0" ]; 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
- cp topology/*.dll ${PGPATHEDB}/lib
+ #strip postgis/postgis-*.dll
+ #strip raster/rt_pg/postgis_raster-*.dll
+ #strip sfcgal/*.dll
+
+ if [ $REGRESS_WITHOUT_TOPOLOGY == "0" ]; 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 == "0" ]; 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"
@@ -119,8 +139,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 == "0" ]; then
+ extensions_to_install="${extensions_to_install} postgis_topology"
+fi
+
+if [ $REGRESS_WITHOUT_RASTER == "0" ]; 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;
@@ -142,10 +174,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}
@@ -157,13 +189,14 @@ fi
cd extensions/address_standardizer
make installcheck
- #test tiger geocoder
- cd ${POSTGIS_SRC}
- cd extensions/postgis_tiger_geocoder
- make installcheck
- if [ "$?" != "0" ]; then
- exit $?
- fi
+#test tiger geocoder
+# cd ${POSTGIS_SRC}
+# cd extensions/postgis_tiger_geocoder
+# make installcheck
+# if [ "$?" != "0" ]; then
+# exit $?
+# fi
+#end extension
fi
if [ "$DUMP_RESTORE" == "1" ]; then
diff --git a/ci/winnie/winnie_common.sh b/ci/winnie/winnie_common.sh
index 8b5925fee..d375cbec6 100644
--- a/ci/winnie/winnie_common.sh
+++ b/ci/winnie/winnie_common.sh
@@ -12,11 +12,11 @@ export MSYS2_ARG_CONV_EXCL=/config/tags
export XML_CATALOG_FILES="/projects/docbook/docbook-5.0.1/catalog.xml"
if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.13.0
+ export GEOS_VER=3.13.1
export GDAL_VER=3.9.2
export PROJ_VER=8.2.1
- export SFCGAL_VER=1.5.2
- export CGAL_VER=5.6.1
+ export SFCGAL_VER=2.1.0
+ export CGAL_VER=6.0.1
export ICON_VER=1.17
export ZLIB_VER=1.2.13
export PROTOBUF_VER=3.2.0
@@ -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
@@ -52,6 +65,18 @@ fi;
echo "LZ4_VER ${LZ4_VER}"
+if [[ "${REGRESS_WITHOUT_TOPOLOGY}" == '' ]] ; then
+ export REGRESS_WITHOUT_TOPOLOGY=0
+fi;
+
+if [[ "${REGRESS_WITHOUT_RASTER}" == '' ]] ; then
+ export REGRESS_WITHOUT_RASTER=0
+fi;
+
+if [[ "${MAKE_EXTENSION}" == '' ]] ; then
+ export MAKE_EXTENSION=0
+fi;
+
#set to something even if override is on but not set
if [[ "${ZLIB_VER}" == '' ]] ; then
@@ -65,11 +90,11 @@ fi;
#set to something even if override is on but not set
if [[ "${CGAL_VER}" == '' ]] ; then
- export CGAL_VER=5.6.1
+ export CGAL_VER=6.0.1
fi;
##hard code versions of cgal etc. for now
-export CGAL_VER=5.6.1
+
BOOST_VER=1.84.0
export BOOST_VER_WU=1_84_0
@@ -123,7 +148,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 +169,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
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/build_postgis.sh | 4 ---
ci/winnie/package_postgis.sh | 74 +++++++++++++++++++++---------------------
ci/winnie/regress_postgis.sh | 77 +++++++++++++++++++++++++++++++-------------
ci/winnie/winnie_common.sh | 44 +++++++++++++++++++++----
4 files changed, 130 insertions(+), 69 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list