This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch modern-packaging in repository postgis.
commit 5b19e943c8d51057de4aab8dbcf7db5b6aa3811a Author: Bas Couwenberg <[email protected]> Date: Sat Oct 8 22:14:44 2016 +0200 Use DEB_BUILD_ARCH instead of DEB_HOST_ARCH. --- debian/changelog | 1 + debian/rules | 47 +++++++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 348ca23..c552714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ postgis (2.3.0+dfsg-3) UNRELEASED; urgency=medium already set via ${shlibs:Depends}. * Rewrite rules file to use dh sequencer. * Rely on dpkg-buildflags instead of including buildflags.mk. + * Use DEB_BUILD_ARCH instead of DEB_HOST_ARCH. -- Bas Couwenberg <[email protected]> Sat, 08 Oct 2016 19:52:11 +0200 diff --git a/debian/rules b/debian/rules index 9bf92e3..f1d75c4 100755 --- a/debian/rules +++ b/debian/rules @@ -11,30 +11,6 @@ export DH_OPTIONS # pie: causes build failure export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes) - -CHECK = check -ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - CHECK = -endif - -# Hurd doesn't implement semaphores; skip regress tests -# mipsel has persisent buildd issues, skip tests too. -# armel has no sfcgal support, and fails interrupt_buffer test. -# kfreebsd-i386, mips64el & sparc64 are not a release architectures. -# hppa (and mips*) fails the tickets and wkb tests because of different NaN representations. -# ppc64 fails to change owner and permissions of the virtualenv -# alpha has issues with the sfcgal support -ifneq (,$(findstring $(DEB_HOST_ARCH),"hurd-i386 mipsel armel hppa kfreebsd-i386 mips64el ppc64 alpha sparc64")) - CHECK = -endif - -# Disable tests on Ubuntu (and derivatives), hanging on their buildds. -ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes) - CHECK = -endif - # Magic to automatically create a debian/control file for the (or all) # supported versions of Postgres. # @@ -60,6 +36,29 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes) + +CHECK = check +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + CHECK = +endif + +# Hurd doesn't implement semaphores; skip regress tests +# mipsel has persisent buildd issues, skip tests too. +# armel has no sfcgal support, and fails interrupt_buffer test. +# kfreebsd-i386, mips64el & sparc64 are not a release architectures. +# hppa (and mips*) fails the tickets and wkb tests because of different NaN representations. +# ppc64 fails to change owner and permissions of the virtualenv +# alpha has issues with the sfcgal support +ifneq (,$(findstring $(DEB_BUILD_ARCH),"hurd-i386 mipsel armel hppa kfreebsd-i386 mips64el ppc64 alpha sparc64")) + CHECK = +endif + +# Disable tests on Ubuntu (and derivatives), hanging on their buildds. +ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes) + CHECK = +endif + # Upstream version (including ~rcN) for symbols version UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
