Christoph Berg pushed to branch experimental at Debian GIS Project / postgis
Commits:
959d7b27 by Christoph Berg at 2018-07-16T21:15:05+02:00
debian/rules: Add progress info when compiling against several PG versions
- - - - -
1b88cf2c by Christoph Berg at 2018-07-16T21:16:57+02:00
Don't run tests in -indep builds.
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ postgis (2.5.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
* Work around failure in building the postgis_tiger_geocoder extension.
* debian/rules: Ignore test failures instead of disabling tests completely
on specific architectures; ignore tests on i386.
+ * Don't run tests in -indep builds.
* debian/rules: Import architecture from /usr/share/dpkg/architecture.mk.
* Re-enable tests on Ubuntu.
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -139,6 +139,7 @@ override_dh_auto_configure:
done)
# PostGIS for the most recent PostgreSQL version
+ @echo " ### configuring $(NEWEST_POSTGRES_VERSION) ###"
./configure $(COMMON_CONFIGURE_ARGS) \
--datadir=\$${prefix}/share/postgresql-$(NEWEST_POSTGRES_VERSION)-postgis \
--with-pgconfig=/usr/lib/postgresql/$(NEWEST_POSTGRES_VERSION)/bin/pg_config
@@ -146,6 +147,7 @@ override_dh_auto_configure:
# PostGIS for all older Postgres versions
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
+ echo " ### configuring $$PGVER ###"; \
cd $(CURDIR)/debian/build-$$PGVER; \
./configure $(COMMON_CONFIGURE_ARGS) \
--datadir=\$${prefix}/share/postgresql-$$PGVER-postgis \
@@ -160,12 +162,14 @@ override_dh_auto_configure:
override_dh_auto_build-arch: build-arch-stamp
build-arch-stamp:
# Build against the newest Postgres version
+ @echo " ### building $(NEWEST_POSTGRES_VERSION) ###"
$(MAKE) $(NJOBS)
$(MAKE) $(NJOBS) -C doc
# Build against all other Postgres versions
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
+ echo " ### building $$PGVER ###"; \
$(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER; \
done)
@@ -185,7 +189,9 @@ override_dh_auto_build-indep: build-arch-stamp
# clever enough to run this before 'install'.
$(MAKE) $(NJOBS) -C extensions
-override_dh_auto_test:
+override_dh_auto_test-indep:
+
+override_dh_auto_test-arch:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Run unit tests (against the newest Postgres version, first)
echo "LD_PRELOAD =
'$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'"
\
View it on GitLab:
https://salsa.debian.org/debian-gis-team/postgis/compare/46c3b8da8112eedb572e86b43b167f9f557ceb74...1b88cf2c4743e53d7d05d323b409f475aa398b63
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/postgis/compare/46c3b8da8112eedb572e86b43b167f9f557ceb74...1b88cf2c4743e53d7d05d323b409f475aa398b63
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
