diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2010-03-12 08:17:40 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2010-03-12 08:17:40 +0000 |
| commit | 6f898e011541c63c516de9ccbb53243647e33571 (patch) | |
| tree | 2ab19f68dbfe64e6ee2828bd434c14e2519840bb /eclass | |
| parent | Mask www-client/chromium dev channel release. (diff) | |
| download | gentoo-2-6f898e011541c63c516de9ccbb53243647e33571.tar.gz gentoo-2-6f898e011541c63c516de9ccbb53243647e33571.tar.bz2 gentoo-2-6f898e011541c63c516de9ccbb53243647e33571.zip | |
aixrtl and hpux-conf _need_ to apply in a loop, mint-conf does not,
(loop dropped in http://overlays.gentoo.org/proj/alt/changeset/55797)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/libtool.eclass | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index 967c21ae7f1e..aa1236701d35 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.84 2010/01/27 20:41:27 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.85 2010/03/12 08:17:40 haubi Exp $ # # Maintainer: base-system@gentoo.org # @@ -304,7 +304,27 @@ elibtoolize() { ret=$? fi ;; - "aixrtl" | "hpux-conf" | "mint-conf" ) + "aixrtl" | "hpux-conf") + ret=1 + local subret=0 + # apply multiple patches as often as they match + while [[ $subret -eq 0 ]]; do + subret=1 + if [[ -e ${x}/configure ]]; then + ELT_walk_patches "${x}/configure" "${y}" + subret=$? + # ltmain.sh and co might be in a subdirectory ... + elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then + ELT_walk_patches "${x}/../configure" "${y}" + subret=$? + fi + if [[ $subret -eq 0 ]]; then + # have at least one patch succeeded. + ret=0 + fi + done + ;; + "mint-conf") ret=1 local subret=1 if [[ -e ${x}/configure ]]; then |