[postgis-tickets] r17392 - have make dist build without raster so no risk of system GDAL dragging in a proj. Take out sfcgal building for now until can troubleshoot

[Regina Obe]

Author: robe
Date: 2019-04-13 19:36:06 -0700 (Sat, 13 Apr 2019)
New Revision: 17392

Modified:
   trunk/ci/debbie/postgis_make_dist.sh
   trunk/ci/debbie/postgis_regress.sh
Log:
have make dist build without raster so no risk of system GDAL dragging in a proj.  Take out sfcgal building for now until can troubleshoot

Modified: trunk/ci/debbie/postgis_make_dist.sh
===================================================================
--- trunk/ci/debbie/postgis_make_dist.sh	2019-04-14 02:05:18 UTC (rev 17391)
+++ trunk/ci/debbie/postgis_make_dist.sh	2019-04-14 02:36:06 UTC (rev 17392)
@@ -19,8 +19,10 @@
 POSTGIS_MINOR_VERSION=`grep ^POSTGIS_MINOR_VERSION Version.config | cut -d= -f2`
 POSTGIS_MICRO_VERSION=`grep ^POSTGIS_MICRO_VERSION Version.config | cut -d= -f2`
 
-export CONFIGURE_ARGS="--with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}"
+#export CONFIGURE_ARGS="--with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}"
 
+export CONFIGURE_ARGS="--with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config --without-raster --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}"
+
 #override the checkout folder used for building tar ball
 export newoutdir="postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}"
 

Modified: trunk/ci/debbie/postgis_regress.sh
===================================================================
--- trunk/ci/debbie/postgis_regress.sh	2019-04-14 02:05:18 UTC (rev 17391)
+++ trunk/ci/debbie/postgis_regress.sh	2019-04-14 02:36:06 UTC (rev 17392)
@@ -16,6 +16,7 @@
 export MAKE_EXTENSION=1
 export DUMP_RESTORE=0
 export MAKE_LOGBT=0
+export NO_SFCGAL=0
 
 ## end variables passed in by jenkins
 
@@ -59,12 +60,12 @@
 fi
 
 ./autogen.sh
-
+#--with-sfcgal=${PROJECTS}/sfcgal/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}/bin/sfcgal-config
 ./configure \
     --with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config \
     --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \
     --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config \
-    --with-sfcgal=${PROJECTS}/sfcgal/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}/bin/sfcgal-config --without-interrupt-tests \
+    --without-interrupt-tests \
     --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 make clean
 make