vapier 11/11/14 17:08:49
Modified: autotools.eclass libtool.eclass
Log:
add a --force flag to elibtoolize so that eautoreconf can make sure it runs even in face of poor interactions with earlier ebuilds/eclasses code #232820
Revision Changes Path
1.110 eclass/autotools.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.109&r2=1.110
Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- autotools.eclass 5 Oct 2011 13:44:25 -0000 1.109
+++ autotools.eclass 14 Nov 2011 17:08:49 -0000 1.110
@@ -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 @@
# 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
}
1.95 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.94&r2=1.95
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- libtool.eclass 3 Oct 2011 04:04:46 -0000 1.94
+++ libtool.eclass 14 Nov 2011 17:08:49 -0000 1.95
@@ -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 @@
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 @@
--no-uclibc)
do_uclibc="no"
;;
+ --force)
+ force="true"
+ ;;
*)
eerror "Invalid elibtoolize option: ${x}"
die "elibtoolize called with ${x} ??"
@@ -186,9 +190,15 @@
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
|
