From: Tim Yamin <plasmaroo@gentoo.org>
Date: Fri, 14 Apr 2006 14:55:54 +0000 (+0000)
Subject: Fix #107628.
X-Git-Tag: v3.4.10.902~373
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0231c8d1b389196c16e0f06fb04f4bf4ee2d5de1;p=genkernel.git

Fix #107628.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@379 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/alpha/config.sh b/alpha/config.sh
index 223aaaa..ed4ce83 100644
--- a/alpha/config.sh
+++ b/alpha/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="arch/alpha/boot/vmlinux.gz"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/ia64/config.sh b/ia64/config.sh
index e2fcd90..0021730 100644
--- a/ia64/config.sh
+++ b/ia64/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="vmlinux.gz"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/parisc/config.sh b/parisc/config.sh
index dfcf56a..0c223fe 100644
--- a/parisc/config.sh
+++ b/parisc/config.sh
@@ -22,5 +22,5 @@ UTILS_LD=ld
 
 COMPRESS_INITRD=yes
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff --git a/parisc64/config.sh b/parisc64/config.sh
index dfcf56a..3fdc4b8 100644
--- a/parisc64/config.sh
+++ b/parisc64/config.sh
@@ -22,5 +22,4 @@ UTILS_LD=ld
 
 COMPRESS_INITRD=yes
 
-MAKEOPTS="-j2"
-
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
diff --git a/ppc/config.sh b/ppc/config.sh
index 3d36ee4..62ea526 100644
--- a/ppc/config.sh
+++ b/ppc/config.sh
@@ -8,7 +8,7 @@ KERNEL_BINARY="vmlinux"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/ppc64/config.sh b/ppc64/config.sh
index 4070d55..5d4296e 100644
--- a/ppc64/config.sh
+++ b/ppc64/config.sh
@@ -8,7 +8,7 @@ KERNEL_BINARY="vmlinux"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/sparc/config.sh b/sparc/config.sh
index 4802eaa..f9d78bb 100644
--- a/sparc/config.sh
+++ b/sparc/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="vmlinux"
 # other stuff seems to compile fine though
 USE_DIETLIBC=0
 
-MAKEOPTS="-j1"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j1"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/sparc64/config.sh b/sparc64/config.sh
index 39aae4b..785cfe9 100644
--- a/sparc64/config.sh
+++ b/sparc64/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="arch/sparc64/boot/image"
 # can turn this flag on
 USE_DIETLIBC=0
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/um/config.sh b/um/config.sh
index 80d8d61..7c9b3f1 100644
--- a/um/config.sh
+++ b/um/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="linux"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE="make ARCH=um"
 UTILS_MAKE=make
diff --git a/x86/config.sh b/x86/config.sh
index 0da8b0c..0346750 100644
--- a/x86/config.sh
+++ b/x86/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="arch/i386/boot/bzImage"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/x86_64/config.sh b/x86_64/config.sh
index c210b5b..00a5c96 100644
--- a/x86_64/config.sh
+++ b/x86_64/config.sh
@@ -7,7 +7,7 @@ KERNEL_BINARY="arch/x86_64/boot/bzImage"
 
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE=make
 UTILS_MAKE=make
diff --git a/xen0/config.sh b/xen0/config.sh
index dfcff61..dcbe991 100644
--- a/xen0/config.sh
+++ b/xen0/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="vmlinuz"
 # other stuff seems to compile fine though
 USE_DIETLIBC=0
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE="make ARCH=xen"
 UTILS_MAKE=make
diff --git a/xenU/config.sh b/xenU/config.sh
index e8c9bdc..f6ef461 100644
--- a/xenU/config.sh
+++ b/xenU/config.sh
@@ -9,7 +9,7 @@ KERNEL_BINARY="vmlinuz"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKEOPTS="-j2"
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
 KERNEL_MAKE="make ARCH=xen"
 UTILS_MAKE=make