Bas Couwenberg pushed to branch master at Debian GIS Project / mapcache
Commits: 02f5b019 by Bas Couwenberg at 2018-07-17T18:49:22+02:00 Use filter instead of findstring to prevent partial matches. - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ mapcache (1.6.1-2) UNRELEASED; urgency=medium * Bump Standards-Version to 4.1.5, no changes. * Update Vcs-* URLs for Salsa. * Strip trailing whitespace from rules file. + * Use filter instead of findstring to prevent partial matches. -- Bas Couwenberg <[email protected]> Fri, 17 Nov 2017 20:38:20 +0100 ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DH_OPTIONS # Enable hardening build flags export DEB_BUILD_MAINT_OPTIONS=hardening=+all -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) @@ -45,7 +45,7 @@ CMAKE_OPTS:= \ -DWITH_OGR=1 # Disable memcache support on architectures where it's not supported -ifneq (,$(findstring $(DEB_HOST_ARCH),"armel armhf i386 mips mipsel powerpc hppa hurd-i386")) +ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf i386 mips mipsel powerpc hppa hurd-i386)) CMAKE_OPTS += -DWITH_MEMCACHE=0 else CMAKE_OPTS += -DWITH_MEMCACHE=1 View it on GitLab: https://salsa.debian.org/debian-gis-team/mapcache/commit/02f5b01932071609b75d7212077a53f83fc4aa55 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapcache/commit/02f5b01932071609b75d7212077a53f83fc4aa55 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
