[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-89-g13f821e

[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  13f821e5906e1a2663eb43b410bb6bd1deba88b6 (commit)
      from  15cc1a3f0c54a6dbfdb275881e8db66aa1ca9cae (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 13f821e5906e1a2663eb43b410bb6bd1deba88b6
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Oct 9 14:55:37 2020 +0200

    Berrie: Disable protobuf and fix init script
    
    Berrie doesn't have protobuf-c installed so, for now,
    disable it in the configure script. Once it has the proper
    packages installed this could be re-enabled

diff --git a/ci/berrie/pg_init_start.sh b/ci/berrie/pg_init_start.sh
index 64566b6..d38d85b 100644
--- a/ci/berrie/pg_init_start.sh
+++ b/ci/berrie/pg_init_start.sh
@@ -20,10 +20,10 @@ PGCTL="$PGPATH/bin/pg_ctl"
 
 # remove cluster if exists
 if [ -d $PGDATA ] ; then
-    if [ -d $PGDATA/postmaster.pid] ; then
+    if [ -d $PGDATA/postmaster.pid ] ; then
     	$PGCTL stop -D $PGDATA -s -m fast
     fi;
-	
+
     rm -rf $PGDATA
 fi;
 
@@ -35,4 +35,4 @@ $DAEMON &
 #sleep a bit because sometimes postgres takes a bit to start up
 sleep 20
 echo "ok"
-exit 0
\ No newline at end of file
+exit 0
diff --git a/ci/berrie/postgis_regress.sh b/ci/berrie/postgis_regress.sh
index 7832355..92f3ae4 100644
--- a/ci/berrie/postgis_regress.sh
+++ b/ci/berrie/postgis_regress.sh
@@ -18,7 +18,7 @@ export PGDATA=$PGPATH/data_${PGPORT}
 export PGHOST=localhost
 
 sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config
+./configure --with-pgconfig=${PGPATH}/bin/pg_config --without-protobuf
 #make clean
 make
 export err_status=0
@@ -30,4 +30,4 @@ err_status=$?
 if [ -d $PGDATA/postmaster.pid ] ; then
 	$PGCTL stop -D $PGDATA -s -m fast
 fi
-exit $err_status
\ No newline at end of file
+exit $err_status

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

Summary of changes:
 ci/berrie/pg_init_start.sh   | 6 +++---
 ci/berrie/postgis_regress.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS