[debian-mysql] Bug#512964: overrides -j setting passed by dpkg-buildpackage

[Robert Millan]

Package: mysql-dfsg-5.0
Version: 5.0.75-1
Severity: normal
Tags: patch

debian/rules overrides the -j settings passed by dpkg-buildpackage.  This
prevents the person building the package from specifically using a number of
threads different than her number of CPUs.

This can be a problem if the system has more CPU cores than are known to work
(untested build setups are automaticaly enabled for new hardware, probably
leading to FTBFS).  Also, detection could fail (e.g. if /proc is not mounted,
or if /proc is not Linux-style), forcing -j1 even if the builder wanted more
threads.

-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.18-6-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-------------- next part --------------
--- debian/rules~	2009-01-25 14:03:47.000000000 +0100
+++ debian/rules	2009-01-25 14:05:06.000000000 +0100
@@ -22,11 +22,6 @@
 
 DISTRIBUTION = $(shell lsb_release -i -s)
 
-MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
-ifeq (${MAKE_J}, -j0)
-  MAKE_J = -j1
-endif
-
 MAKE_TEST_TARGET=test-force
 ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),)
 # make test-bt is the testsuite run by the MySQL build team 
@@ -129,7 +124,7 @@
 build-stamp: configure
 	dh_testdir
 
-	$(MAKE) $(MAKE_J)
+	$(MAKE)
 
 ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
 	if [ ! -f testsuite-stamp ] ; then \