|
Lines 154-159
Link Here
|
| 154 |
|
154 |
|
| 155 |
S="${WORKDIR}/${MY_P}-src" |
155 |
S="${WORKDIR}/${MY_P}-src" |
| 156 |
|
156 |
|
|
|
157 |
# adds support for distcc |
| 158 |
# makeopts_loadavg is used for -j ifdef, otherwise continue using makeopts_jobs |
| 159 |
get_makeopts() { |
| 160 |
if [[ $(makeopts_loadavg) == 999 ]]; then |
| 161 |
echo $(makeopts_jobs) |
| 162 |
else |
| 163 |
echo $( printf "%.0f" $(makeopts_loadavg) ) |
| 164 |
fi |
| 165 |
|
| 166 |
} |
| 167 |
|
| 157 |
toml_usex() { |
168 |
toml_usex() { |
| 158 |
usex "${1}" true false |
169 |
usex "${1}" true false |
| 159 |
} |
170 |
} |
|
Lines 503-509
Link Here
|
| 503 |
( |
514 |
( |
| 504 |
IFS=$'\n' |
515 |
IFS=$'\n' |
| 505 |
env $(cat "${S}"/config.env) RUST_BACKTRACE=1\ |
516 |
env $(cat "${S}"/config.env) RUST_BACKTRACE=1\ |
| 506 |
"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die |
517 |
"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(get_makeopts) || die |
| 507 |
) |
518 |
) |
| 508 |
} |
519 |
} |
| 509 |
|
520 |
|
|
Lines 549-555
Link Here
|
| 549 |
IFS=$'\n' |
560 |
IFS=$'\n' |
| 550 |
env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \ |
561 |
env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \ |
| 551 |
"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \ |
562 |
"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \ |
| 552 |
-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}" |
563 |
-j$(get_makeopts) --no-doc --no-fail-fast "${t}" |
| 553 |
) |
564 |
) |
| 554 |
then |
565 |
then |
| 555 |
failed+=( "${t}" ) |
566 |
failed+=( "${t}" ) |
|
Lines 567-573
Link Here
|
| 567 |
( |
578 |
( |
| 568 |
IFS=$'\n' |
579 |
IFS=$'\n' |
| 569 |
env $(cat "${S}"/config.env) DESTDIR="${D}" \ |
580 |
env $(cat "${S}"/config.env) DESTDIR="${D}" \ |
| 570 |
"${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die |
581 |
"${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(get_makeopts) || die |
| 571 |
) |
582 |
) |
| 572 |
|
583 |
|
| 573 |
# bug #689562, #689160 |
584 |
# bug #689562, #689160 |
