From: Regina Obe <lr@pcorp.us>
Date: Wed, 29 Nov 2017 01:12:37 +0000 (+0000)
Subject: Explicitly specify $(PERL) to call create_unpackaged.pl otherwise at least on freebsd... 
X-Git-Tag: 2.3.6~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74323113a9d9b5c9eea75e4acf48918602916a07;p=postgis

Explicitly specify $(PERL) to call create_unpackaged.pl otherwise at least on freebsd it fails (and backport other minor changes like remove of 9.1 which support was dropped in 2.2)
Closes #3938 for PostGIS 2.3.6
Also add the Bessie sisters to battery testing

git-svn-id: http://svn.osgeo.org/postgis/branches/2.3@16124 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/ci/bessie/postgis_regress.sh b/ci/bessie/postgis_regress.sh
new file mode 100644
index 000000000..f1997716b
--- /dev/null
+++ b/ci/bessie/postgis_regress.sh
@@ -0,0 +1,8 @@
+export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
+sh autogen.sh
+./configure --with-projdir=/usr/local --with-libiconv=/usr/local --without-interrupt-tests
+make clean
+make
+export PGUSER=postgres
+export PGIS_REG_TMPDIR=~/tmp/pgis_reg_${TAG}
+make check
diff --git a/ci/bessie32/postgis_regress.sh b/ci/bessie32/postgis_regress.sh
new file mode 100644
index 000000000..f1997716b
--- /dev/null
+++ b/ci/bessie32/postgis_regress.sh
@@ -0,0 +1,8 @@
+export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
+sh autogen.sh
+./configure --with-projdir=/usr/local --with-libiconv=/usr/local --without-interrupt-tests
+make clean
+make
+export PGUSER=postgres
+export PGIS_REG_TMPDIR=~/tmp/pgis_reg_${TAG}
+make check
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 707a34915..24f4a5f6f 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -26,18 +26,16 @@ DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
 
 PG_CONFIG    =  @PG_CONFIG@
 
-PG91         = $(shell $(PG_CONFIG) --version | $(GREP) -qE " 8\.| 9\.0" && echo no || echo yes)
 SQL_BITS     = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN += sql/*.sql ${SQL_BITS} 
+EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
 
-ifeq ($(PG91),yes)
 all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 	mkdir -p sql
 	cp $< $@
-	
+
 sql/$(EXTENSION).sql: sql_bits/sfcgal.sql  sql_bits/sfcgal_comments.sql
 	mkdir -p sql
 	cat $^ > $@
@@ -66,7 +64,7 @@ sql_bits/sfcgal_comments.sql: ../../doc/sfcgal_comments.sql
 #then remove default values and extra junk
 sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/sfcgal.sql ../../utils/create_unpackaged.pl
 	mkdir -p sql
-	cat $< | ../../utils/create_unpackaged.pl ${EXTENSION} > $@
+	cat $< |  $(PERL) ../../utils/create_unpackaged.pl ${EXTENSION} > $@
 
 sql_bits/sfcgal_upgrade.sql : ../../postgis/sfcgal_upgrade.sql
 	mkdir -p sql_bits
@@ -74,17 +72,16 @@ sql_bits/sfcgal_upgrade.sql : ../../postgis/sfcgal_upgrade.sql
 
 sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
 	mkdir -p sql_bits
-	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
+	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
 sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql
 	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
   	  cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
 	done
-	
+
 DATA = $(wildcard sql/*--*.sql)
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
-endif
 
 distclean: clean
 	rm Makefile