add a --force flag to elibtoolize so that eautoreconf can make sure it runs even...

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 11364171a49bedb45d6a227ee5446400b4b4b98c..5ee2a3e976e835bb5430154cb81f3e0ae5deae99 100644 (file)
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.109 2011/10/05 13:44:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.110 2011/11/14 17:08:49 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -146,7 +146,7 @@ eautoreconf() {
 
        # Call it here to prevent failures due to elibtoolize called _before_
        # eautoreconf.  We set $S because elibtoolize runs on that #265319
-       S=${PWD} elibtoolize
+       S=${PWD} elibtoolize --force
 
        return 0
 }

diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index c6a06b99e6b475d7c4e18469bc89fcbb23c8c77f..b36e7e388387d07e386d98cb172faf6ea25f331b 100644 (file)
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.94 2011/10/03 04:04:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.95 2011/11/14 17:08:49 vapier Exp $
 
 # @ECLASS: libtool.eclass
 # @MAINTAINER:
@@ -119,6 +119,7 @@ elibtoolize() {
        local do_uclibc="yes"
        local deptoremove=
        local do_shallow="no"
+       local force="false"
        local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
 
        for x in "$@" ; do
@@ -153,6 +154,9 @@ elibtoolize() {
                        --no-uclibc)
                                do_uclibc="no"
                                ;;
+                       --force)
+                               force="true"
+                               ;;
                        *)
                                eerror "Invalid elibtoolize option: ${x}"
                                die "elibtoolize called with ${x} ??"
@@ -186,9 +190,15 @@ elibtoolize() {
        for d in "$@" ; do
                export ELT_APPLIED_PATCHES=
 
-               [[ -f ${d}/.elibtoolized ]] && continue
+               if [[ -f ${d}/.elibtoolized ]] ; then
+                       ${force} || continue
+               fi
 
                einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
+               if [[ -f ${d}/.elibtoolized ]] ; then
+                       ewarn "  We've already been run in this tree; you should"
+                       ewarn "  avoid this if possible (perhaps by filing a bug)"
+               fi
 
                for p in ${elt_patches} ; do
                        local ret=0