[SCM] PostGIS branch stable-3.4 updated. 3.4.1-27-gb286dd218
git at osgeo.org
git at osgeo.org
Mon Jan 8 15:31:34 PST 2024
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 b286dd218e8976bf0c9ec4629677e0f0f23f8fcc (commit)
via 64358372184766bacdf6cf662e0e50be8d0e2537 (commit)
from a7b38eac8e8071d0407c2106ca5a0252c6e31012 (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 b286dd218e8976bf0c9ec4629677e0f0f23f8fcc
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Jan 8 15:31:00 2024 -0800
Clarify documentation page typos regarding gdal_vsi_options, references #5653
diff --git a/doc/reference_guc.xml b/doc/reference_guc.xml
index 6526788e9..1b7b657aa 100644
--- a/doc/reference_guc.xml
+++ b/doc/reference_guc.xml
@@ -261,7 +261,7 @@ SELECT pg_reload_conf();
<refentry id="postgis_gdal_vsi_options">
<refnamediv>
- <refname>postgis.gdal_config_options</refname>
+ <refname>postgis.gdal_vsi_options</refname>
<refpurpose>
A string configuration to set options used when working with an out-db raster.
</refpurpose>
@@ -282,12 +282,12 @@ SELECT pg_reload_conf();
<para>Set <varname>postgis.gdal_vsi_options</varname> for current session:</para>
<programlisting>
-SET postgis.gdal_config_options = 'AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxx AWS_SECRET_ACCESS_KEY=yyyyyyyyyyyyyyyyyyyyyyyyyy';
+SET postgis.gdal_vsi_options = 'AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxx AWS_SECRET_ACCESS_KEY=yyyyyyyyyyyyyyyyyyyyyyyyyy';
</programlisting>
<para>Set <varname>postgis.gdal_vsi_options</varname> just for the <emphasis>current transaction</emphasis> using the <varname>LOCAL</varname> keyword:</para>
<programlisting>
-SET LOCAL postgis.gdal_config_options = 'AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxx AWS_SECRET_ACCESS_KEY=yyyyyyyyyyyyyyyyyyyyyyyyyy';
+SET LOCAL postgis.gdal_vsi_options = 'AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxx AWS_SECRET_ACCESS_KEY=yyyyyyyyyyyyyyyyyyyyyyyyyy';
</programlisting>
</refsection>
commit 64358372184766bacdf6cf662e0e50be8d0e2537
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Jan 8 14:55:59 2024 -0800
Fix MacOS linking issues in 3.4 branch
diff --git a/configure.ac b/configure.ac
index dacc381d5..858110d82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -764,6 +764,22 @@ if test ! "$POSTGIS_GEOS_VERSION" -ge 30600; then
AC_MSG_ERROR([PostGIS requires GEOS >= 3.6.0])
fi
+#
+# MacOS with XCode > 15 now requires rpath entries for
+# libraries like GEOS/Proj that might be flexibly installed
+# with movability expected
+#
+case $host_os in
+ darwin*)
+ GEOS_RPATH=`echo $GEOS_LDFLAGS | $PERL -nle 'print "$1" if /\-L ?(\S+) /'`
+ AC_MSG_RESULT([checking for GEOS_RPATH under MacOS... $GEOS_RPATH])
+ if test "x$GEOS_RPATH" != "x"; then
+ # Add the rpath setting to the LDFLAGS
+ GEOS_LDFLAGS="$GEOS_LDFLAGS -Wl,-rpath,$GEOS_RPATH"
+ fi
+ ;;
+esac
+
dnl Extract the linker and include flags
GEOS_LDFLAGS=`$GEOSCONFIG --clibs`
GEOS_CPPFLAGS=`$GEOSCONFIG --cflags`
@@ -922,6 +938,24 @@ else
PROJ_LDFLAGS="-lproj"
fi
+#
+# MacOS with XCode > 15 now requires rpath entries for
+# libraries like GEOS/Proj that might be flexibly installed
+# with movability expected
+#
+case $host_os in
+ darwin*)
+ PROJ_RPATH=`echo $PROJ_LDFLAGS | $PERL -nle 'print "$1" if /\-L ?(\S+) /'`
+ AC_MSG_RESULT([checking for PROJ_RPATH under MacOS... $PROJ_RPATH])
+ if test "x$PROJ_RPATH" != "x"; then
+ # Add the rpath setting to the LDFLAGS
+ PROJ_LDFLAGS="$PROJ_LDFLAGS -Wl,-rpath,$PROJ_RPATH"
+ fi
+ ;;
+esac
+
+
+
dnl Check that we can find the proj_api.h header file
CPPFLAGS_SAVE="$CPPFLAGS"
diff --git a/liblwgeom/cunit/Makefile.in b/liblwgeom/cunit/Makefile.in
index a382e2f3a..83fc75baf 100644
--- a/liblwgeom/cunit/Makefile.in
+++ b/liblwgeom/cunit/Makefile.in
@@ -22,7 +22,7 @@ LIBTOOL = @LIBTOOL@
CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
CUNIT_CPPFLAGS = -I$(srcdir)/.. -I$(builddir)/.. @CUNIT_CPPFLAGS@ @CPPFLAGS@
CFLAGS=$(CUNIT_CPPFLAGS) @CFLAGS@
-LDFLAGS = @GEOS_LDFLAGS@ $(CUNIT_LDFLAGS)
+LDFLAGS = @GEOS_LDFLAGS@ @PROJ_LDFLAGS@ $(CUNIT_LDFLAGS)
VPATH = $(srcdir)
diff --git a/liblwgeom/lwgeodetic.c b/liblwgeom/lwgeodetic.c
index 89cf47589..982e4e4af 100644
--- a/liblwgeom/lwgeodetic.c
+++ b/liblwgeom/lwgeodetic.c
@@ -2637,23 +2637,10 @@ int lwpoly_covers_lwpoly(const LWPOLY *poly1, const LWPOLY *poly2)
/* check if all vertices of poly2 are inside poly1 */
for (i = 0; i < poly2->nrings; i++)
{
-
- /* every other ring is a hole, check if point is inside the actual polygon */
- if ( i % 2 == 0)
+ if (LW_FALSE == lwpoly_covers_pointarray(poly1, poly2->rings[i]))
{
- if (LW_FALSE == lwpoly_covers_pointarray(poly1, poly2->rings[i]))
- {
- LWDEBUG(4,"returning false, geometry2 has point outside of geometry1");
- return LW_FALSE;
- }
- }
- else
- {
- if (LW_TRUE == lwpoly_covers_pointarray(poly1, poly2->rings[i]))
- {
- LWDEBUG(4,"returning false, geometry2 has point inside a hole of geometry1");
- return LW_FALSE;
- }
+ LWDEBUG(4,"returning false, geometry2 has point outside of geometry1");
+ return LW_FALSE;
}
}
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 86f274556..c17fbce6b 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -29,7 +29,7 @@ CFLAGS= -I$(top_srcdir)/liblwgeom -I$(top_builddir)/liblwgeom @CPPFLAGS@ @CFLAGS
SHELL = @SHELL@
LIBTOOL = @LIBTOOL@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @PROJ_LDFLAGS@ @GEOS_LDFLAGS@
# Filenames with extension as determined by the OS
POSTGIS-CLI=postgis
diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 250dac361..a08bbc355 100644
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -47,6 +47,7 @@ LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
LIBGDAL_DEPLIBS_LDFLAGS=@LIBGDAL_DEPLIBS_LDFLAGS@
PROJ_CFLAGS=@PROJ_CPPFLAGS@
+PROJ_LDFLAGS=@PROJ_LDFLAGS@
GEOS_CFLAGS=@GEOS_CPPFLAGS@
GEOS_LDFLAGS=@GEOS_LDFLAGS@
@@ -77,6 +78,7 @@ LDFLAGS = \
$(LIBGDAL_LDFLAGS) \
$(LIBGDAL_DEPLIBS_LDFLAGS) \
$(GEOS_LDFLAGS) \
+ $(PROJ_LDFLAGS) \
$(GETTEXT_LDFLAGS) \
$(ICONV_LDFLAGS)
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 34 ++++++++++++++++++++++++++++++++++
doc/reference_guc.xml | 6 +++---
liblwgeom/cunit/Makefile.in | 2 +-
liblwgeom/lwgeodetic.c | 19 +++----------------
loader/Makefile.in | 2 +-
raster/loader/Makefile.in | 2 ++
6 files changed, 44 insertions(+), 21 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list