Source: zeroc-ice Version: 3.5.1-6 Severity: normal Tags: patch Hello,
Find attached patch to honor parallel builds instead taking all cores available. Regards -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (900, 'unstable') Architecture: i386 (i686) Kernel: Linux 3.14-2-686-pae (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru zeroc-ice-3.5.1/debian/changelog zeroc-ice-3.5.1/debian/changelog --- zeroc-ice-3.5.1/debian/changelog 2014-04-26 15:17:00.000000000 +0200 +++ zeroc-ice-3.5.1/debian/changelog 2014-11-11 18:42:08.000000000 +0100 @@ -1,3 +1,10 @@ +zeroc-ice (3.5.1-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * d/rules: honor parallel DEB_BUILD_OPTION. + + -- Hector Oron <zu...@debian.org> Tue, 11 Nov 2014 18:41:25 +0100 + zeroc-ice (3.5.1-6) unstable; urgency=medium * Bug fix: "Depends on obsolete version of Ruby (1.9)", thanks to diff -Nru zeroc-ice-3.5.1/debian/rules zeroc-ice-3.5.1/debian/rules --- zeroc-ice-3.5.1/debian/rules 2014-04-24 22:01:16.000000000 +0200 +++ zeroc-ice-3.5.1/debian/rules 2014-11-11 18:40:59.000000000 +0100 @@ -9,14 +9,10 @@ # hardening-wrapper export DEB_BUILD_HARDENING=1 -# Get number of hardware processors -PROCESSORS := $(shell cat /proc/cpuinfo | grep processor | wc -l) -ifeq ($(PROCESSORS),0) - PROCESSORS := 1 -else - ifneq ($(PROCESSORS),1) - PROCESSORS := $(shell expr $(PROCESSORS) - 1) - endif +# Support parallel=<n> in DEB_BUILD_OPTIONS +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + USE_CPUS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(USE_CPUS) endif V=3.5.1 @@ -51,7 +47,7 @@ lp64suffix="" \ USE_READLINE=yes \ CPP11=yes \ - -j $(PROCESSORS) + $(NJOBS) MAKE_INVOKE := make $(MAKE_COMMON_FLAGS) LANGS_ARCH:=cpp py rb php
diff -Nru zeroc-ice-3.5.1/debian/changelog zeroc-ice-3.5.1/debian/changelog --- zeroc-ice-3.5.1/debian/changelog 2014-04-26 15:17:00.000000000 +0200 +++ zeroc-ice-3.5.1/debian/changelog 2014-11-11 18:42:08.000000000 +0100 @@ -1,3 +1,10 @@ +zeroc-ice (3.5.1-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * d/rules: honor parallel DEB_BUILD_OPTION. + + -- Hector Oron <zu...@debian.org> Tue, 11 Nov 2014 18:41:25 +0100 + zeroc-ice (3.5.1-6) unstable; urgency=medium * Bug fix: "Depends on obsolete version of Ruby (1.9)", thanks to diff -Nru zeroc-ice-3.5.1/debian/rules zeroc-ice-3.5.1/debian/rules --- zeroc-ice-3.5.1/debian/rules 2014-04-24 22:01:16.000000000 +0200 +++ zeroc-ice-3.5.1/debian/rules 2014-11-11 18:40:59.000000000 +0100 @@ -9,14 +9,10 @@ # hardening-wrapper export DEB_BUILD_HARDENING=1 -# Get number of hardware processors -PROCESSORS := $(shell cat /proc/cpuinfo | grep processor | wc -l) -ifeq ($(PROCESSORS),0) - PROCESSORS := 1 -else - ifneq ($(PROCESSORS),1) - PROCESSORS := $(shell expr $(PROCESSORS) - 1) - endif +# Support parallel=<n> in DEB_BUILD_OPTIONS +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + USE_CPUS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(USE_CPUS) endif V=3.5.1 @@ -51,7 +47,7 @@ lp64suffix="" \ USE_READLINE=yes \ CPP11=yes \ - -j $(PROCESSORS) + $(NJOBS) MAKE_INVOKE := make $(MAKE_COMMON_FLAGS) LANGS_ARCH:=cpp py rb php
