Author: aurel32
Date: 2008-01-03 10:46:44 +0000 (Thu, 03 Jan 2008)
New Revision: 2770
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
Log:
Revert r2764 as dpkg-buildpackage will be fixed
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-01-03 10:43:55 UTC (rev
2769)
+++ glibc-package/trunk/debian/changelog 2008-01-03 10:46:44 UTC (rev
2770)
@@ -4,7 +4,6 @@
* patches/localedata/locale-ks_IN.diff: new locale contributed by Rakesh
Pandit. Closes: #457351.
* patches/series: enable patches/any/cvs-vfscanf.diff. Closes: #453408.
- * Remove DEB_BUILD_OPTIONS=parallel=n support, as it is deprecated.
* Support dpkg-buildpackage -j, but only debian/rules is actually run in
parallel.
* patches/any/cvs-iconv-iso2022jp-loop-bug.diff: patch from CVS to fix
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2008-01-03 10:43:55 UTC (rev 2769)
+++ glibc-package/trunk/debian/rules 2008-01-03 10:46:44 UTC (rev 2770)
@@ -68,6 +68,13 @@
# tools do (config.sub). Map them.
KERNEL_HOST_CPU := $(subst powerpc,ppc,$(DEB_HOST_GNU_CPU))
+# 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
+endif
+
# Default setup
GLIBC_PASSES ?= libc
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2008-01-03 10:43:55 UTC (rev
2769)
+++ glibc-package/trunk/debian/rules.d/build.mk 2008-01-03 10:46:44 UTC (rev
2770)
@@ -82,7 +82,7 @@
$(patsubst %,build_%,$(GLIBC_PASSES)) :: build_% : $(stamp)build_%
$(stamp)build_%: $(stamp)configure_%
@echo Building $(curpass)
- $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR))
+ $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS))
$(call logme, -a $(log_build), echo "---------------" ; echo -n "Build
ended: " ; date --rfc-2822)
touch $@
@@ -112,7 +112,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) -k check
2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) -j
$(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); \
@@ -129,7 +129,7 @@
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk
IN=$(DEB_SRCDIR)/localedata/SUPPORTED \
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
- $(MAKE) -C $(DEB_BUILDDIR) \
+ $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass)
\
localedata/install-locales; \
rm -rf $(CURDIR)/debian/locales-all/usr/lib; \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
