Author: aurel32
Date: 2008-01-01 22:07:23 +0000 (Tue, 01 Jan 2008)
New Revision: 2764
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Remove DEB_BUILD_OPTIONS=parallel=n, as it is deprecated.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-12-31 17:46:45 UTC (rev
2763)
+++ glibc-package/trunk/debian/changelog 2008-01-01 22:07:23 UTC (rev
2764)
@@ -4,11 +4,12 @@
* 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, as it is deprecated.
[ Clint Adams ]
* debhelper.in/nscd.init: use lsb output functions. Closes: #457661.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 30 Dec 2007 20:30:49 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 01 Jan 2008 23:06:46 +0100
glibc (2.7-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2007-12-31 17:46:45 UTC (rev 2763)
+++ glibc-package/trunk/debian/rules 2008-01-01 22:07:23 UTC (rev 2764)
@@ -68,13 +68,6 @@
# 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 2007-12-31 17:46:45 UTC (rev
2763)
+++ glibc-package/trunk/debian/rules.d/build.mk 2008-01-01 22:07:23 UTC (rev
2764)
@@ -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) -j $(NJOBS))
+ $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR))
$(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) -j
$(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) -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) -j $(NJOBS) \
+ $(MAKE) -C $(DEB_BUILDDIR) \
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]
