Lines 348-363
eautoheader() {
Link Here
|
348 |
# @DESCRIPTION: |
348 |
# @DESCRIPTION: |
349 |
# Runs autoconf. |
349 |
# Runs autoconf. |
350 |
eautoconf() { |
350 |
eautoconf() { |
351 |
if [[ ! -f configure.ac && ! -f configure.in ]] ; then |
351 |
if [[ $* != *" --at-file "* ]]; then |
352 |
echo |
352 |
if [[ ! -f configure.ac && ! -f configure.in ]] ; then |
353 |
eerror "No configure.{ac,in} present in '${PWD}'!" |
353 |
echo |
354 |
echo |
354 |
eerror "No configure.{ac,in} present in '${PWD}'!" |
355 |
die "No configure.{ac,in} present!" |
355 |
echo |
356 |
fi |
356 |
die "No configure.{ac,in} present!" |
357 |
if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then |
357 |
fi |
358 |
eqawarn "This package has a configure.in file which has long been deprecated. Please" |
358 |
if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then |
359 |
eqawarn "update it to use configure.ac instead as newer versions of autotools will die" |
359 |
eqawarn "This package has a configure.in file which has long been deprecated. Please" |
360 |
eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." |
360 |
eqawarn "update it to use configure.ac instead as newer versions of autotools will die" |
|
|
361 |
eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." |
362 |
fi |
361 |
fi |
363 |
fi |
362 |
|
364 |
|
363 |
autotools_run_tool --at-m4flags autoconf "$@" |
365 |
autotools_run_tool --at-m4flags autoconf "$@" |
Lines 477-495
autotools_env_setup() {
Link Here
|
477 |
# around it in the process. |
479 |
# around it in the process. |
478 |
autotools_run_tool() { |
480 |
autotools_run_tool() { |
479 |
# Process our own internal flags first |
481 |
# Process our own internal flags first |
480 |
local autofail=true m4flags=false missing_ok=false return_output=false |
482 |
local autofail=true m4flags=false missing_ok=false return_output=false args=() files=() |
481 |
while [[ -n $1 ]] ; do |
483 |
while [[ -n $1 ]] ; do |
482 |
case $1 in |
484 |
case $1 in |
483 |
--at-no-fail) autofail=false;; |
485 |
--at-no-fail) autofail=false;; |
484 |
--at-m4flags) m4flags=true;; |
486 |
--at-m4flags) m4flags=true;; |
485 |
--at-missing) missing_ok=true;; |
487 |
--at-missing) missing_ok=true;; |
486 |
--at-output) return_output=true;; |
488 |
--at-output) return_output=true;; |
|
|
489 |
--at-file) shift; files+=( "$1" );; |
487 |
# whatever is left goes to the actual tool |
490 |
# whatever is left goes to the actual tool |
488 |
*) break;; |
491 |
*) args+=( "$1" );; |
489 |
esac |
492 |
esac |
490 |
shift |
493 |
shift |
491 |
done |
494 |
done |
492 |
|
495 |
|
|
|
496 |
set -- "${args[@]}" |
497 |
|
493 |
if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then |
498 |
if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then |
494 |
ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" |
499 |
ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" |
495 |
fi |
500 |
fi |
Lines 518-523
autotools_run_tool() {
Link Here
|
518 |
set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include) |
523 |
set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include) |
519 |
fi |
524 |
fi |
520 |
|
525 |
|
|
|
526 |
set -- "$@" "${files[@]}" |
527 |
|
521 |
# If the caller wants to probe something, then let them do it directly. |
528 |
# If the caller wants to probe something, then let them do it directly. |
522 |
if ${return_output} ; then |
529 |
if ${return_output} ; then |
523 |
"$@" |
530 |
"$@" |