diff options
| author |  David Leverton <levertond@googlemail.com>
| 2012-04-08 14:41:27 +0100 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2012-04-08 14:41:27 +0100 |
| commit | ad2ae2ba3b6fc8f113638a86de0e7d8a6a046091 (patch) | |
| tree | ba3ee328a4be5f52aeed4a44c1cd887caaf745f9 | |
| parent | cbbab86a1389a8081135f174b62413485111bf7e (diff) | |
| download | paludis-ad2ae2ba3b6fc8f113638a86de0e7d8a6a046091.tar.gz paludis-ad2ae2ba3b6fc8f113638a86de0e7d8a6a046091.tar.xz | |
Fix help-dependent econf option ordering
Fixes: ticket:1230
| -rw-r--r-- | paludis/repositories/e/ebuild/0/build_functions.bash | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild/0/build_functions.bash b/paludis/repositories/e/ebuild/0/build_functions.bash index 571951c..7304557 100644 --- a/paludis/repositories/e/ebuild/0/build_functions.bash +++ b/paludis/repositories/e/ebuild/0/build_functions.bash @@ -45,9 +45,10 @@ econf() [[ -z "${CBUILD}" ]] || LOCAL_EXTRA_ECONF="--build=${CBUILD} ${LOCAL_EXTRA_ECONF}" [[ -z "${CTARGET}" ]] || LOCAL_EXTRA_ECONF="--target=${CTARGET} ${LOCAL_EXTRA_ECONF}" + local extra_options_help="" for i in ${PALUDIS_ECONF_EXTRA_OPTIONS_HELP_DEPENDENT}; do "${ECONF_SOURCE}/configure" --help 2>/dev/null | grep -q "${i%%::*}" \ - && LOCAL_EXTRA_ECONF+=" ${i#*::}" + && extra_options_help+=" ${i#*::}" done # If the ebuild passed in --prefix, use that to set --libdir. KDE at least needs this. @@ -78,6 +79,7 @@ econf() --sysconfdir=/etc \ --localstatedir=/var/lib \ ${PALUDIS_ECONF_EXTRA_OPTIONS} \ + ${extra_options_help} \ ${libcmd} "$@" ${LOCAL_EXTRA_ECONF} 1>&2 ${LOCAL_ECONF_WRAPPER} "${ECONF_SOURCE}"/configure \ @@ -89,6 +91,7 @@ econf() --sysconfdir=/etc \ --localstatedir=/var/lib \ ${PALUDIS_ECONF_EXTRA_OPTIONS} \ + ${extra_options_help} \ ${libcmd} "$@" ${LOCAL_EXTRA_ECONF} || die "econf failed" else |