[postgis-tickets] [SCM] PostGIS branch out-of-tree-builds updated. 3.2.0-321-gbd233ac14
git at osgeo.org
git at osgeo.org
Thu Jan 20 10:47:40 PST 2022
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, out-of-tree-builds has been updated
via bd233ac1489c69678eebd6dd94acca394973c76e (commit)
via dde0fce1bd6d8f32b65d719983cb97fa811b83cf (commit)
from 2b210f4a9a2d9400f90ad37d927bec8a893acf1e (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 bd233ac1489c69678eebd6dd94acca394973c76e
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 19:47:29 2022 +0100
Fix check-unit under doc/
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f63f08eeb..d15ba8190 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -432,7 +432,7 @@ ifeq ($(XMLLINT),)
check-unit: requirements_not_met_xmllint
else
check-unit: $(XML_INPUTS)
- $(XMLLINT) --loaddtd --xinclude --valid postgis-out.xml > /dev/null
+ $(XMLLINT) --loaddtd --path $(srcdir) --xinclude --valid postgis-out.xml > /dev/null
endif
check-localized:
commit dde0fce1bd6d8f32b65d719983cb97fa811b83cf
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 19:43:18 2022 +0100
Fix build of unit tests of loader
diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index 429fa8521..a6f842a73 100644
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -2,6 +2,8 @@
# *
# * PostGIS - Spatial Types for PostgreSQL
# * http://postgis.net
+# *
+# * Copyright 2022 Sandro Santilli <strk at kbt.io>
# * Copyright 2008 Paul Ramsey, Mark Cave-Ayland
# *
# * This is free software; you can redistribute and/or modify it under
@@ -10,13 +12,22 @@
# **********************************************************************
top_builddir = @top_builddir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
CC=@CC@
CFLAGS=@CFLAGS@
SHELL = @SHELL@
LIBTOOL = @LIBTOOL@
CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=-I.. @CUNIT_CPPFLAGS@ @CPPFLAGS@
+CUNIT_CPPFLAGS = \
+ -I$(srcdir)/.. \
+ -I$(top_builddir)/liblwgeom \
+ -I$(top_srcdir)/liblwgeom \
+ -I.. \
+ @CUNIT_CPPFLAGS@ \
+ @CPPFLAGS@
# GTK includes and libraries
GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
@@ -28,7 +39,7 @@ PGSQL_FE_CPPFLAGS=@PGSQL_FE_CPPFLAGS@
PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@
# liblwgeom
-LIBLWGEOM=../../liblwgeom/.libs/liblwgeom.la
+LIBLWGEOM = $(top_builddir)/liblwgeom/.libs/liblwgeom.la
# iconv flags
ICONV_LDFLAGS=@ICONV_LDFLAGS@
@@ -48,6 +59,8 @@ CFLAGS += $(GETTEXT_CFLAGS) $(ICONV_CFLAGS) $(PROJ_CFLAGS)
# Build full linking line
LDFLAGS = $(GEOS_LDFLAGS) $(GETTEXT_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(ICONV_LDFLAGS) $(CUNIT_LDFLAGS) $(PROJ_LDFLAGS)
+VPATH = $(srcdir)
+
# Object files
OBJS= \
cu_pgsql2shp.o \
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 2 +-
loader/cunit/Makefile.in | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list