r1482 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2006-05-16 23:40:43 +0000 (Tue, 16 May 2006)
New Revision: 1482
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/sysdeps/kfreebsd.mk
glibc-package/trunk/debian/sysdeps/linux.mk
Log:
* Move the NJOBS part to debian/sysdeps/(system) to debian/rules.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-16 22:17:50 UTC (rev 1481)
+++ glibc-package/trunk/debian/changelog 2006-05-16 23:40:43 UTC (rev 1482)
@@ -18,6 +18,7 @@
* /usr/sbin/tzconfig: set umask to 022. (Closes: #367145)
* debian/main/control.in: make locales Replaces: lliurex-belocs-locales-data.
(Closes: #365651)
+ * Move the NJOBS part to debian/sysdeps/(system) to debian/rules.
[ Denis Barbier ]
* Preserve hard links when compiling the locales-all package, this reduces
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-05-16 22:17:50 UTC (rev 1481)
+++ glibc-package/trunk/debian/rules 2006-05-16 23:40:43 UTC (rev 1482)
@@ -68,9 +68,23 @@
# tools do (config.sub). Map them.
KERNEL_HOST_CPU := $(subst powerpc,ppc,$(DEB_HOST_GNU_CPU))
-# How many makes to run at once?
-NJOBS = 1
+# Support multiple makes at once based on number of processors
+# Common wisdom says parallel make can be up to 2n+1.
+# Should we do that to get faster builds?
+NJOBS:=$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ifeq ($(NJOBS),-1)
+ NJOBS:=1
+endif
+ifeq ($(NJOBS),0)
+ NJOBS=1
+endif
+
+# We can override its value by SETNJOBS environment variable.
+ifdef SETNJOBS
+ NJOBS:=$(SETNJOBS)
+endif
+
# Default setup
GLIBC_PASSES ?= libc
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-05-16 22:17:50 UTC (rev 1481)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-05-16 23:40:43 UTC (rev 1482)
@@ -2,18 +2,6 @@
MIN_KERNEL_SUPPORTED := 5.4.0
libc = libc0.1
-# Support multiple makes at once based on number of processors
-# Common wisdom says parallel make can be up to 2n+1.
-# Should we do that to get faster builds?
-NJOBS:=$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-ifeq ($(NJOBS),-1)
- NJOBS:=1
-endif
-
-ifeq ($(NJOBS),0)
- NJOBS=1
-endif
-
# Linuxthreads Config
threads = yes
libc_add-ons = linuxthreads $(add-ons)
Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-16 22:17:50 UTC (rev 1481)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-16 23:40:43 UTC (rev 1482)
@@ -2,23 +2,6 @@
MIN_KERNEL_SUPPORTED := 2.4.1
libc = libc6
-# Support multiple makes at once based on number of processors
-# Common wisdom says parallel make can be up to 2n+1.
-# Should we do that to get faster builds?
-NJOBS:=$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-ifeq ($(NJOBS),-1)
- NJOBS:=1
-endif
-
-ifeq ($(NJOBS),0)
- NJOBS=1
-endif
-
-# We can override its value by SETNJOBS environment variable.
-ifdef SETNJOBS
- NJOBS:=$(SETNJOBS)
-endif
-
# Linuxthreads Config
threads = yes
libc_add-ons = linuxthreads $(add-ons)
Reply to: