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 223aaaa047fb66fc5ead09814e409eecab791ab1..ed4ce83ea4ad8b7d4d501a05531238f1d0d39858 100644 (file)
--- 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 e2fcd90ef41f4d356d2993da2e3909a8b244d4b8..00217305ac2c2d599db584333d7f61bbaaba6b06 100644 (file)
--- 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 dfcf56afd62fddb747e8e45a8f01d3ed26e876a6..0c223fe5129eec9cce913dfeda1b7a4ed27c1178 100644 (file)
--- 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 dfcf56afd62fddb747e8e45a8f01d3ed26e876a6..3fdc4b8ab1fd2256ae575d44e2031c6473b51324 100644 (file)
--- 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 3d36ee439115f5f540293e9e897aa34da77dcbee..62ea52672b3dbe2c066c0d1b49399d4ed8426e2f 100644 (file)
--- 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 4070d558fdeb3fab56f8afc1269e4245680b1a56..5d4296ea30b60a5a1c0f199bcf56bc2ec3c41064 100644 (file)
--- 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 4802eaa43f54193064d267062543f509eb3a542a..f9d78bb58c511fd13b9a98e23de931dc14bfef5e 100644 (file)
--- 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 39aae4b17deaef30836dd245e2c4f6afca2e3f0c..785cfe949d312865cf06e077c3f12297e219aa19 100644 (file)
--- 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 80d8d617f2054d69809e7eee1edaa1f2a635cd71..7c9b3f192c88e391cd733118bdfb1a1246f81bd1 100644 (file)
--- 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 0da8b0c9f85477a35e6e94e9c8a0947f99dbf711..03467501d79a911cc7e05f37655e019ff7145065 100644 (file)
--- 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 c210b5b7ffe22f6e6f97d19650cda4ae1c47dcea..00a5c96f6c062babde17e97c7cd3320ac4add9eb 100644 (file)
--- 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 dfcff612aa39a9a3a52b4bef597958442461be02..dcbe991ab4ad03cc04824c32281235582f873786 100644 (file)
--- 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 e8c9bdc5296755b17f8c8edd6fbeafda44ea2135..f6ef461b0659d0d1d18154ffe5e339a4f18817cb 100644 (file)
--- 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