Bas Couwenberg pushed to branch master at Debian GIS Project / mapnik
Commits: 097774ae by Bas Couwenberg at 2018-07-17T18:51:53+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 @@ -2,6 +2,7 @@ mapnik (3.0.20+ds-2) UNRELEASED; urgency=medium * Strip trailing whitespace from changelog & rules files. * Bump Standards-Version to 4.1.5, no changes. + * Use filter instead of findstring to prevent partial matches. -- Bas Couwenberg <[email protected]> Mon, 07 May 2018 21:10:00 +0200 ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -12,19 +12,19 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) endif -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) # Disable parallel builds for problematic architectures -NO_PARALLEL_ARCHS = "arm64 armel armhf alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64" +NO_PARALLEL_ARCHS = arm64 armel armhf alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) # From mapnik (3.0.8+ds-1ubuntu1): # The amd64 buildds are castrated to 4G RAM and 4G swap, # the ppc64el buildds to 12G RAM and 4G swap. - NO_PARALLEL_ARCHS += "amd64 ppc64el" + NO_PARALLEL_ARCHS += amd64 ppc64el endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_PARALLEL_ARCHS))) +ifneq (,$(filter $(DEB_BUILD_ARCH),$(NO_PARALLEL_ARCHS))) NJOBS = -j1 endif View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/commit/097774ae3c984217844ada5139cebc6adbe178d8 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/commit/097774ae3c984217844ada5139cebc6adbe178d8 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
