diff options
Diffstat (limited to 'app-portage/sisyphus/files')
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus-makeopts.patch | 26 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.build-env.conf (renamed from app-portage/sisyphus/files/sisyphus.env.conf) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.make-conf.conf (renamed from app-portage/sisyphus/files/sisyphus.make.conf) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.make-opts.conf | 3 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.package-env.conf (renamed from app-portage/sisyphus/files/sisyphus.package.env) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.package-keywords.conf (renamed from app-portage/sisyphus/files/sisyphus.package.keywords) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.package-license.conf (renamed from app-portage/sisyphus/files/sisyphus.package.license) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.package-mask.conf (renamed from app-portage/sisyphus/files/sisyphus.package.mask) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.package-unmask.conf (renamed from app-portage/sisyphus/files/sisyphus.package.unmask) | 0 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus.package-use.conf (renamed from app-portage/sisyphus/files/sisyphus.package.use) | 0 |
10 files changed, 29 insertions, 0 deletions
diff --git a/app-portage/sisyphus/files/sisyphus-makeopts.patch b/app-portage/sisyphus/files/sisyphus-makeopts.patch new file mode 100644 index 00000000..1a44b9fa --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus-makeopts.patch @@ -0,0 +1,26 @@ +diff --git a/src/helpers/set_jobs b/src/helpers/set_jobs +index df3e080..b04c965 100755 +--- a/src/helpers/set_jobs ++++ b/src/helpers/set_jobs +@@ -1,6 +1,6 @@ + #!/usr/bin/env bash + +-portageConfigDir="/opt/redcore-build/conf/intel/portage" ++sisyphusConfigDir="/etc/sisyphus" + + setjobs () { + # default MAKEOPTS value is -j64, but that's overkill for lower spec machines +@@ -8,11 +8,9 @@ setjobs () { + # however since compilation is largely pointer-following, SMT won't help much + # and can lead to memory starvation and stalls; DO NOT use logical cores + if [[ $(cat /sys/devices/system/cpu/smt/active) -eq 1 ]]; then +- sed -i "s/\-j\([0-9]\+\)/\-j$(expr $(getconf _NPROCESSORS_ONLN) / 2)/g" "$portageConfigDir"/make.conf/00-makeopts.conf >/dev/null 2>&1 # global makeopts (exclude kernel) +- sed -i "s/\-j\([0-9]\+\)/\-j$(expr $(getconf _NPROCESSORS_ONLN) / 2)/g" "$portageConfigDir"/env/makenoise.conf >/dev/null 2>&1 # kernel makeopts ++ sed -i "s/\-j\([0-9]\+\)/\-j$(expr $(getconf _NPROCESSORS_ONLN) / 2)/g" "$sisyphusConfigDir"/sisyphus.make-opts.conf >/dev/null 2>&1 # global makeopts + elif [[ $(cat /sys/devices/system/cpu/smt/active) -eq 0 ]]; then +- sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/make.conf/00-makeopts.conf >/dev/null 2>&1 # global makeopts (exclude kernel) +- sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/env/makenoise.conf >/dev/null 2>&1 # kernel makeopts ++ sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$sisyphusConfigDir"/sisyphus.make-opts.conf >/dev/null 2>&1 # global makeopts + fi + } + diff --git a/app-portage/sisyphus/files/sisyphus.env.conf b/app-portage/sisyphus/files/sisyphus.build-env.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.env.conf +++ b/app-portage/sisyphus/files/sisyphus.build-env.conf diff --git a/app-portage/sisyphus/files/sisyphus.make.conf b/app-portage/sisyphus/files/sisyphus.make-conf.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.make.conf +++ b/app-portage/sisyphus/files/sisyphus.make-conf.conf diff --git a/app-portage/sisyphus/files/sisyphus.make-opts.conf b/app-portage/sisyphus/files/sisyphus.make-opts.conf new file mode 100644 index 00000000..79d3bc18 --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus.make-opts.conf @@ -0,0 +1,3 @@ +# This file has been automatically generated, do not edit. + +MAKEOPTS="-j64" diff --git a/app-portage/sisyphus/files/sisyphus.package.env b/app-portage/sisyphus/files/sisyphus.package-env.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.package.env +++ b/app-portage/sisyphus/files/sisyphus.package-env.conf diff --git a/app-portage/sisyphus/files/sisyphus.package.keywords b/app-portage/sisyphus/files/sisyphus.package-keywords.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.package.keywords +++ b/app-portage/sisyphus/files/sisyphus.package-keywords.conf diff --git a/app-portage/sisyphus/files/sisyphus.package.license b/app-portage/sisyphus/files/sisyphus.package-license.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.package.license +++ b/app-portage/sisyphus/files/sisyphus.package-license.conf diff --git a/app-portage/sisyphus/files/sisyphus.package.mask b/app-portage/sisyphus/files/sisyphus.package-mask.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.package.mask +++ b/app-portage/sisyphus/files/sisyphus.package-mask.conf diff --git a/app-portage/sisyphus/files/sisyphus.package.unmask b/app-portage/sisyphus/files/sisyphus.package-unmask.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.package.unmask +++ b/app-portage/sisyphus/files/sisyphus.package-unmask.conf diff --git a/app-portage/sisyphus/files/sisyphus.package.use b/app-portage/sisyphus/files/sisyphus.package-use.conf index e69de29b..e69de29b 100644 --- a/app-portage/sisyphus/files/sisyphus.package.use +++ b/app-portage/sisyphus/files/sisyphus.package-use.conf |