[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-38-g1970ba8

[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  1970ba88667b6c0626d3e8ab0cfec77316b22838 (commit)
      from  87922037fd09b68ad2ada409f776e06590924256 (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 1970ba88667b6c0626d3e8ab0cfec77316b22838
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Mar 6 13:24:59 2020 +0100

    Raster cunit: Fix inclusion
    
    Deals with Freebsd crashes in Jenkins

diff --git a/raster/test/cunit/Makefile.in b/raster/test/cunit/Makefile.in
index f341e18..53427fa 100644
--- a/raster/test/cunit/Makefile.in
+++ b/raster/test/cunit/Makefile.in
@@ -24,18 +24,21 @@ PROJ_CFLAGS=@PROJ_CPPFLAGS@
 PROJ_LDFLAGS=@PROJ_LDFLAGS@
 GEOS_CFLAGS=@GEOS_CPPFLAGS@
 GEOS_LDFLAGS=@GEOS_LDFLAGS@
+CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
 
 RTCORE_CFLAGS=-I$(RT_CORE)
 RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a
 
 CC=@CC@
 CFLAGS = \
+	-I.. \
 	$(LIBLWGEOM_CFLAGS) \
 	$(RTCORE_CFLAGS) \
 	$(PROJ_CFLAGS) \
 	$(LIBGDAL_CFLAGS) \
 	$(GEOS_CFLAGS) \
-	@CFLAGS@ \
+	@CUNIT_CPPFLAGS@ \
+	@CFLAGS@
 
 LDFLAGS = \
 	$(RTCORE_LDFLAGS) \
@@ -44,8 +47,6 @@ LDFLAGS = \
 	$(GEOS_LDFLAGS) \
 	$(PROJ_LDFLAGS)
 
-CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@
 
 # ADD YOUR NEW TEST FILE HERE (1/1)
 OBJS=	\
@@ -84,7 +85,7 @@ cu_tester: $(RT_CORE)/librtcore.a $(OBJS)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c
-	$(CC) $(CUNIT_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(RT_CORE)/librtcore.a:
 	$(MAKE) -C ../../rt_core

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

Summary of changes:
 raster/test/cunit/Makefile.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS