[SCM] PostGIS branch stable-3.3 updated. 3.3.6-3-g662ad692a

git at osgeo.org git at osgeo.org
Mon Feb 26 09:38:48 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.3 has been updated
       via  662ad692a28e702547b76f222a2406b007486adc (commit)
      from  373326f16be126f55688bd3ead94f9eb40edefef (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 662ad692a28e702547b76f222a2406b007486adc
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Mon Feb 26 02:57:27 2024 +0100

    Make sure our vendored flatbuffers copy has a unique namespace
    
    Cf https://lists.osgeo.org/pipermail/gdal-dev/2024-February/058544.html
    and https://github.com/OSGeo/gdal/pull/9313

diff --git a/deps/flatgeobuf/Makefile.in b/deps/flatgeobuf/Makefile.in
index 2510cad89..185220def 100644
--- a/deps/flatgeobuf/Makefile.in
+++ b/deps/flatgeobuf/Makefile.in
@@ -29,7 +29,10 @@ srcdir = @srcdir@
 libdir = @libdir@
 
 CXX = @FLATGEOBUF_CXX@
-CXXFLAGS =-I$(top_srcdir)/liblwgeom -I$(top_builddir)/liblwgeom -I$(srcdir)/include @CPPFLAGS@ @CXXFLAGS@ @PICFLAGS@
+# This ugly -Dflatbuffers=postgis_flatbuffers is to prevent potential subtle
+# clash with other flatbuffers copies that could come from GDAL or its
+# dependencies.
+CXXFLAGS =-I$(top_srcdir)/liblwgeom -I$(top_builddir)/liblwgeom -I$(srcdir)/include @CPPFLAGS@ @CXXFLAGS@ @PICFLAGS@ -Dflatbuffers=postgis_flatbuffers
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 

-----------------------------------------------------------------------

Summary of changes:
 deps/flatgeobuf/Makefile.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list