[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-4

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 0cf8b272c843f69b96170408067d27c5329b6a6d
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Oct 3 14:23:40 2013 +0200

    Force parallel=1 to overcome memory exhaustion issues on buildd.

diff --git a/debian/rules b/debian/rules
index cc56087..9f2b249 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,9 @@ endif
 
 TARNAME := mapnik_$(UPVER)+ds1.orig.tar
 
-NJOBS := -j1
-ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-endif
-
 # scons flags
-SCONS_FLAGS := $(NJOBS)
+# Disable parallel build - it exhausts memory on s390, mipsel, mips
+SCONS_FLAGS := -j1
 SCONS_FLAGS += INPUT_PLUGINS=csv,gdal,geojson,ogr,osm,postgis,python,raster,rasterlite,shape,sqlite
 SCONS_FLAGS += PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib
 SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts

-- 
C++/Python toolkit for developing GIS applications