From e267e167db3056f5c26facfaa3a8b6a310138623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Tue, 25 Aug 2015 16:01:51 +0000 Subject: debian: remove custom parallel compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to build a debian package with upstream source, the user should do ./autogen.sh cp -a debian.upstream debian debuild -eDEB_BUILD_OPTIONS="parallel=8" -us -uc -b The environment variable DEB_BUILD_OPTIONS="parallel=8" is the canonical way to make a parallel build (-j8 in this case). This commit removes the script in debian/rules that detects the number of cpus, requested by the environment variable DEBIAN_BUILD_NCPUS, which is not official in debian. Signed-off-by: Víctor Manuel Jáquez Leal https://bugzilla.gnome.org/show_bug.cgi?id=754087 --- debian.upstream/rules | 9 --------- 1 file changed, 9 deletions(-) diff --git a/debian.upstream/rules b/debian.upstream/rules index 4a73db61..fe7eae2c 100755 --- a/debian.upstream/rules +++ b/debian.upstream/rules @@ -5,15 +5,6 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -# Allow SMP build -ifeq ($(DEBIAN_BUILD_NCPUS),) - DEBIAN_BUILD_NCPUS = $(shell /usr/bin/getconf _NPROCESSORS_ONLN) -endif -ifneq ($(DEBIAN_BUILD_NCPUS),) - EXTRA_MAKE_FLAGS += -j$(DEBIAN_BUILD_NCPUS) -endif -MAKE += $(EXTRA_MAKE_FLAGS) - # Allow HTML documentation build indep_conf_flags = \ --with-html-dir=\$${prefix}/share/doc/$(DEB_SOURCE_PACKAGE) -- cgit v1.2.1