[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-107-gd304bad

[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  d304bada1c7fed6b2f3f20a0f417ec26ebe8ad42 (commit)
       via  52e0c2f4b369c08f6920e42698951133d787ce24 (commit)
      from  3af1395de1890910fb98e6c59c49c210a806da8a (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 d304bada1c7fed6b2f3f20a0f417ec26ebe8ad42
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Oct 29 00:05:17 2020 +0100

    Remove unused variable

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index be788f5..59eb918 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -39,13 +39,15 @@ SQL_built=postgis.sql uninstall_postgis.sql postgis_upgrade.sql legacy.sql unins
 DATA=../spatial_ref_sys.sql
 
 # SQL objects (files requiring pre-processing)
-SQL_objs=postgis.sql legacy.sql legacy_minimal.sql
+SQL_OBJS = \
+	postgis.sql \
+	legacy.sql \
+	legacy_minimal.sql
 
 GEOM_BACKEND_OBJ = lwgeom_geos.o
 
 BACKEND_OBJ=$(GEOM_BACKEND_OBJ)
 DATA_built=$(SQL_built)
-SQL_OBJS=$(SQL_objs)
 
 ifeq (@HAVE_SPGIST@,yes)
 SPGIST_OBJ= gserialized_spgist_2d.o gserialized_spgist_3d.o gserialized_spgist_nd.o

commit 52e0c2f4b369c08f6920e42698951133d787ce24
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Oct 29 00:04:57 2020 +0100

    Fix sfcgal_upgrade.sql build

diff --git a/sfcgal/Makefile.in b/sfcgal/Makefile.in
index 1aecd2b..9455981 100644
--- a/sfcgal/Makefile.in
+++ b/sfcgal/Makefile.in
@@ -42,11 +42,7 @@ SQLPP = @SQLPP@
 
 # SQL objects (files requiring pre-processing)
 SQL_OBJS = \
-  sfcgal.sql \
-	sfcgal_upgrade.sql.in \
-  sfcgal_upgrade.sql \
-  sfcgal_after_upgrade.sql \
-  sfcgal_before_upgrade.sql
+  sfcgal.sql
 
 # Objects to build using PGXS
 
@@ -68,9 +64,6 @@ PG_CPPFLAGS += @SFCGAL_CPPFLAGS@
 SHLIB_LINK_F += @SFCGAL_LDFLAGS@
 endif
 
-# Set PERL _after_ the include of PGXS
-PERL=@PERL@
-
 # This is to workaround a bug in PGXS 8.4 win32 link line,
 # see http://trac.osgeo.org/postgis/ticket/1158#comment:57
 SHLIB_LINK := $(SHLIB_LINK_F) $(SHLIB_LINK)
@@ -79,18 +72,6 @@ SHLIB_LINK := $(SHLIB_LINK_F) $(SHLIB_LINK)
 PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 
-# Make all PostGIS objects depend upon liblwgeom, so that if an underlying
-# change is made, a PostGIS rebuild is triggered.
-#
-# Also they are all dependent on postgis_config.h
-# and thus postgis_revision.h
-#
-$(OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postgis_config.h ../postgis_revision.h
-
-# SQL objects are also dependent on postgis_config.h for PostgreSQL
-# version
-$(SQL_OBJS): ../postgis_config.h ../postgis_revision.h
-
 # Note: we specify liblwgeom.a directly in SHLIB_LINK rather than using
 # -L... -l options to prevent issues with some platforms trying to link
 # to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
@@ -107,7 +88,11 @@ endif
 
 # Extra files to remove during 'make clean'
 EXTRA_CLEAN=$(SQL_OBJS) \
-	uninstall_sfcgal.sql
+	uninstall_sfcgal.sql \
+	sfcgal_upgrade.sql.in \
+	sfcgal_upgrade.sql \
+	sfcgal_after_upgrade.sql \
+	sfcgal_before_upgrade.sql
 
 # PGXS information
 PG_CONFIG := @PG_CONFIG@
@@ -140,6 +125,19 @@ ifeq ($(REGRESS),1)
 	datamoduledir=contrib/postgis
 endif
 
+# Make all PostGIS objects depend upon liblwgeom, so that if an underlying
+# change is made, a PostGIS rebuild is triggered.
+#
+# Also they are all dependent on postgis_config.h
+# and thus postgis_revision.h
+#
+$(OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postgis_config.h ../postgis_revision.h
+
+# SQL objects are also dependent on postgis_config.h for PostgreSQL
+# version
+$(SQL_OBJS): ../postgis_config.h ../postgis_revision.h
+
+
 # Borrow the $libdir substitution from PGXS but customise by running the preprocessor
 # and adding the version number
 # replace @extschema at . with nothing, this is only used as placeholder for extension install

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

Summary of changes:
 postgis/Makefile.in |  6 ++++--
 sfcgal/Makefile.in  | 40 +++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
PostGIS