[Pkg-mysql-commits] r2082 - mysql-5.5/branches/experimental/debian

[Nicholas Bamber]

tags 512964 pending
thanks

Author: periapt
Date: 2012-05-04 11:25:09 +0000 (Fri, 04 May 2012)
New Revision: 2082

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/rules
Log:
Stopped overriding the -j build parameter (Closes: #512964)

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-05-04 06:26:17 UTC (rev 2081)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-05-04 11:25:09 UTC (rev 2082)
@@ -1,3 +1,9 @@
+mysql-5.5 (5.5.23-2) UNRELEASED; urgency=low
+
+  * Stopped overriding the -j build parameter (Closes: #512964)
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Fri, 04 May 2012 07:26:25 +0100
+
 mysql-5.5 (5.5.23-1) experimental; urgency=low
 
   * Added patch to test suite to accept socket paths less than 40

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2012-05-04 06:26:17 UTC (rev 2081)
+++ mysql-5.5/branches/experimental/debian/rules	2012-05-04 11:25:09 UTC (rev 2082)
@@ -27,11 +27,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 fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team 
@@ -125,20 +120,18 @@
 
 override_dh_auto_build: build-stamp build-pic-stamp
 
-MAKE_PIC = cd $(builddir) && $(MAKE) $(MAKE_J)
-
 build-stamp:
 	@echo "RULES.$@"
 	[ -f $(EXPORTED_SOURCE_TARBALL) ] || tar -zcf $(EXPORTED_SOURCE_TARBALL) \
 	--exclude=debian . \
 	--transform="s,^\./,mysql-5.5/,"
-	cd $(builddir) && $(MAKE) $(MAKE_J)
+	cd $(builddir) && $(MAKE)
 	touch $@
 
 build-pic-stamp:
 	@echo "RULES.$@"
-	$(MAKE_PIC) -C scripts
-	$(MAKE_PIC) -C libmysqld
+	cd $(builddir) && $(MAKE) -C scripts
+	cd $(builddir) && $(MAKE) -C libmysqld
 	touch $@
 
 override_dh_auto_test: