[SCM] PostGIS branch stable-3.2 updated. 3.2.7-3-gc90e28232
git at osgeo.org
git at osgeo.org
Mon Feb 26 09:42:56 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.2 has been updated
via c90e28232af39b95996fd5e0680de0559a756b75 (commit)
via 68f535253694f40adef9f700fbe719eaa716ea5d (commit)
from 2052b5710a99736548a29b78477807dd30c491d7 (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 c90e28232af39b95996fd5e0680de0559a756b75
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Feb 26 09:42:47 2024 -0800
Fix typo
diff --git a/deps/flatgeobuf/Makefile.in b/deps/flatgeobuf/Makefile.in
index 3199b1111..73639772b 100644
--- a/deps/flatgeobuf/Makefile.in
+++ b/deps/flatgeobuf/Makefile.in
@@ -26,7 +26,7 @@ CXX = @FLATGEOBUF_CXX@
# 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../../liblwgeom -Iinclude I$(top_builddir)/liblwgeom -I$(srcdir)/include @CPPFLAGS@ @CXXFLAGS@ @PICFLAGS@ -Dflatbuffers=postgis_flatbuffers
+CXXFLAGS =-I../../liblwgeom -Iinclude -I$(top_builddir)/liblwgeom -I$(srcdir)/include @CPPFLAGS@ @CXXFLAGS@ @PICFLAGS@ -Dflatbuffers=postgis_flatbuffers
LDFLAGS = @LDFLAGS@
top_builddir = @top_builddir@
commit 68f535253694f40adef9f700fbe719eaa716ea5d
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 fd5c74171..3199b1111 100644
--- a/deps/flatgeobuf/Makefile.in
+++ b/deps/flatgeobuf/Makefile.in
@@ -23,7 +23,11 @@
# **********************************************************************/
CXX = @FLATGEOBUF_CXX@
-CXXFLAGS =-I../../liblwgeom -Iinclude @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../../liblwgeom -Iinclude I$(top_builddir)/liblwgeom -I$(srcdir)/include @CPPFLAGS@ @CXXFLAGS@ @PICFLAGS@ -Dflatbuffers=postgis_flatbuffers
+
LDFLAGS = @LDFLAGS@
top_builddir = @top_builddir@
libdir = @libdir@
-----------------------------------------------------------------------
Summary of changes:
deps/flatgeobuf/Makefile.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list