Merge branch 'master' of git.calculate.ru:calculate

14 years ago · 051fc2621f
parent 3a513e143c 0cfd03bbea
commit 051fc2621f
2 changed files with 2 additions and 2 deletions
--- a/install/builder/profile/0builder/etc/make.conf
+++ b/install/builder/profile/0builder/etc/make.conf
@ -5,7 +5,7 @@ ACCEPT_LICENSE="*"

 #compile-time option to accelerate
 MAKEOPTS="#-makeopts-#"
-EMERGE_DEFAULT_OPTS="--jobs"
+EMERGE_DEFAULT_OPTS="--jobs=4"

 #connect layman for include calculate overlay
 source /var/lib/layman/make.conf
--- a/install/profile/1default/etc/make.conf?pass=install&linuxver>=10.0
+++ b/install/profile/1default/etc/make.conf?pass=install&linuxver>=10.0
@ -24,5 +24,5 @@ source /usr/local/portage/layman/make.conf
 # compile-time option to accelerate
 #----------------------------------
 MAKEOPTS="#-makeopts-#"
-EMERGE_DEFAULT_OPTS="--jobs=4 --load-average=10"
+EMERGE_DEFAULT_OPTS="--jobs=4"