Author: aurel32
Date: 2008-03-11 19:57:53 +0000 (Tue, 11 Mar 2008)
New Revision: 2865
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
Log:
* rules, rules.d/build.mk: fix parallel build.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-11 13:02:01 UTC (rev
2864)
+++ glibc-package/trunk/debian/changelog 2008-03-11 19:57:53 UTC (rev
2865)
@@ -24,6 +24,7 @@
* Update Italian debconf translation, by Lica Monducci. Closes: #469985.
* control.in/main, sysdeps/*.mk, rules: build with gcc-4.3 by default,
except on alpha, arm, armel, hppa, s390 and hurd-i386.
+ * rules, rules.d/build.mk: fix parallel build.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-blocked-exceptions.diff: new patch to dump
@@ -33,7 +34,7 @@
* patches/hurd-i386/local-gcc-4.1-init-first.diff: Update and actually
apply.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 09 Mar 2008 13:48:43 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 11 Mar 2008 20:57:24 +0100
glibc (2.7-9) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2008-03-11 13:02:01 UTC (rev 2864)
+++ glibc-package/trunk/debian/rules 2008-03-11 19:57:53 UTC (rev 2865)
@@ -70,9 +70,7 @@
# Support multiple makes at once based on number of processors
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-NJOBS := 1
+NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
# Default setup
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2008-03-11 13:02:01 UTC (rev
2864)
+++ glibc-package/trunk/debian/rules.d/build.mk 2008-03-11 19:57:53 UTC (rev
2865)
@@ -82,10 +82,10 @@
$(patsubst %,build_%,$(GLIBC_PASSES)) :: build_% : $(stamp)build_%
$(stamp)build_%: $(stamp)configure_%
@echo Building $(curpass)
- $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS))
+ $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS))
$(call logme, -a $(log_build), echo "---------------" ; echo -n "Build
ended: " ; date --rfc-2822)
if [ $(curpass) = libc ]; then \
- $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
+ $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) \
objdir=$(DEB_BUILDDIR)
install_root=$(CURDIR)/build-tree/locales-all \
localedata/install-locales; \
tar --use-compress-program /usr/bin/lzma --owner root --group root
-cf $(CURDIR)/build-tree/locales-all/supported.tar.lzma -C
$(CURDIR)/build-tree/locales-all/usr/lib/locale .; \
@@ -118,7 +118,7 @@
echo -n "Testsuite started: " | tee -a $(log_test); \
date --rfc-2822 | tee -a $(log_test); \
echo "--------------" | tee -a $(log_test); \
- TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) -j
$(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS)
-k check 2>&1 | tee -a $(log_test); \
echo "--------------" | tee -a $(log_test); \
echo -n "Testsuite ended: " | tee -a $(log_test); \
date --rfc-2822 | tee -a $(log_test); \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
