[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-93-g97903f899

[git at osgeo.org]

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  97903f89960c8079e8edf9c9b9db74dd66c1e194 (commit)
      from  9261883feaf369689d1ea2871eddf6ebcbf1b6ad (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 97903f89960c8079e8edf9c9b9db74dd66c1e194
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Sep 15 20:11:45 2022 +0200

    Do not hide preprocessor bugs
    
    See
    https://github.com/postgis/postgis/pull/706#issuecomment-1248389918

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 73d084254..9c12a4e4d 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -65,7 +65,8 @@ sql:
 # Borrow the $libdir substitution from PGXS but customise by running the preprocessor
 # and adding the version number
 sql/%.sql: %.sql.in | sql
-	$(SQLPP) -I at buiddir@/../libpgcommon $< | grep -v '^#' | \
+	$(SQLPP) -I at buiddir@/../libpgcommon $< > $@.tmp
+	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
 
 %.control: %.control.in Makefile
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 6fd828247..5d1473f6c 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -135,7 +135,8 @@ sql/postgis_upgrade_for_extension.sql.in: sql/postgis_for_extension.sql ../../ut
 	$(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
 
 sql/postgis_for_extension.sql: ../../postgis/postgis.sql.in ../../postgis_revision.h | sql
-	$(SQLPP) -I at builddir@/../../postgis $< | grep -v '^#' | \
+	$(SQLPP) -I at builddir@/../../postgis $< > $@.tmp
+	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe \
 		"s'MODULE_PATHNAME'\$(MODULEPATH)'g" \
 		| $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' > $@
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 33cb4f250..a1d4ad613 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -93,7 +93,8 @@ sql/rtpostgis.sql: sql/rtpostgis_for_extension.sql | sql
 	$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 sql/rtpostgis_for_extension.sql: ../../raster/rt_pg/rtpostgis.sql.in ../../postgis_revision.h | sql
-	$(SQLPP) -I at builddir@/../../postgis/ -I../../ $< | grep -v '^#' | \
+	$(SQLPP) -I at builddir@/../../postgis/ -I../../ $< > $@.tmp
+	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
 
 sql/rtpostgis_upgrade.sql: sql/rtpostgis_upgrade_for_extension.sql | sql
diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index be8bd5755..b5aef0768 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -237,8 +237,9 @@ endif
 # and adding the version number
 # replace @extschema at . with nothing, this is only used as placeholder for extension install
 %.sql: %.sql.in
-	$(SQLPP) -I at top_srcdir@/libpgcommon -I at builddir@ $< | grep -v '^#' | \
-	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
+	$(SQLPP) -I at top_srcdir@/libpgcommon -I at builddir@ $< > $@.tmp
+	grep -v '^#' $@.tmp | $(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
+	rm -f $@.tmp
 
 #this is redundant but trying to fold in with extension just hangs
 postgis_upgrade.sql.in: postgis.sql ../utils/create_upgrade.pl
diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index ae70a859e..8146f66da 100644
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -125,7 +125,8 @@ endif
 # and adding the version number
 # replace @extschema at . with nothing, this is only used as placeholder for extension install
 %.sql: %.sql.in
-	$(SQLPP) -I at top_builddir@/postgis/ $< | grep -v '^#' | \
+	$(SQLPP) -I at top_builddir@/postgis/ $< > $@.tmp
+	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
 
 ../../liblwgeom/.libs/liblwgeom.a:
diff --git a/sfcgal/Makefile.in b/sfcgal/Makefile.in
index 9504ead5b..b003d1b89 100644
--- a/sfcgal/Makefile.in
+++ b/sfcgal/Makefile.in
@@ -122,7 +122,8 @@ $(SQL_OBJS): ../postgis_config.h ../postgis_revision.h
 # and adding the version number
 # replace @extschema at . with nothing, this is only used as placeholder for extension install
 %.sql: %.sql.in
-	$(SQLPP) -I at top_builddir@/postgis $< | grep -v '^#' | \
+	$(SQLPP) -I at top_builddir@/postgis $< > $@.tmp
+	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
 
 sfcgal_upgrade.sql.in: sfcgal.sql ../utils/create_upgrade.pl
diff --git a/topology/Makefile.in b/topology/Makefile.in
index 9b53bf98f..4315df092 100644
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -102,7 +102,8 @@ endif
 
 # Generate any .sql file from .sql.in files by running them through the SQL pre-processor
 %.sql: %.sql.in
-	$(SQLPP) -I at top_builddir@/postgis $< | grep -v '^#' | \
+	$(SQLPP) -I at top_builddir@/postgis $< > $@.tmp
+	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
 
 #Generate upgrade script by stripping things that can't be reinstalled

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

Summary of changes:
 extensions/address_standardizer/Makefile.in | 3 ++-
 extensions/postgis/Makefile.in              | 3 ++-
 extensions/postgis_raster/Makefile.in       | 3 ++-
 postgis/Makefile.in                         | 5 +++--
 raster/rt_pg/Makefile.in                    | 3 ++-
 sfcgal/Makefile.in                          | 3 ++-
 topology/Makefile.in                        | 3 ++-
 7 files changed, 15 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS