1 |
vapier 11/11/14 17:08:49 |
2 |
|
3 |
Modified: autotools.eclass libtool.eclass |
4 |
Log: |
5 |
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 |
6 |
|
7 |
Revision Changes Path |
8 |
1.110 eclass/autotools.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.110&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.110&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.109&r2=1.110 |
13 |
|
14 |
Index: autotools.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
17 |
retrieving revision 1.109 |
18 |
retrieving revision 1.110 |
19 |
diff -u -r1.109 -r1.110 |
20 |
--- autotools.eclass 5 Oct 2011 13:44:25 -0000 1.109 |
21 |
+++ autotools.eclass 14 Nov 2011 17:08:49 -0000 1.110 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2011 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.109 2011/10/05 13:44:25 vapier Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.110 2011/11/14 17:08:49 vapier Exp $ |
27 |
|
28 |
# @ECLASS: autotools.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -146,7 +146,7 @@ |
31 |
|
32 |
# Call it here to prevent failures due to elibtoolize called _before_ |
33 |
# eautoreconf. We set $S because elibtoolize runs on that #265319 |
34 |
- S=${PWD} elibtoolize |
35 |
+ S=${PWD} elibtoolize --force |
36 |
|
37 |
return 0 |
38 |
} |
39 |
|
40 |
|
41 |
|
42 |
1.95 eclass/libtool.eclass |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.95&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.95&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.94&r2=1.95 |
47 |
|
48 |
Index: libtool.eclass |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v |
51 |
retrieving revision 1.94 |
52 |
retrieving revision 1.95 |
53 |
diff -u -r1.94 -r1.95 |
54 |
--- libtool.eclass 3 Oct 2011 04:04:46 -0000 1.94 |
55 |
+++ libtool.eclass 14 Nov 2011 17:08:49 -0000 1.95 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2011 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.94 2011/10/03 04:04:46 vapier Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.95 2011/11/14 17:08:49 vapier Exp $ |
61 |
|
62 |
# @ECLASS: libtool.eclass |
63 |
# @MAINTAINER: |
64 |
@@ -119,6 +119,7 @@ |
65 |
local do_uclibc="yes" |
66 |
local deptoremove= |
67 |
local do_shallow="no" |
68 |
+ local force="false" |
69 |
local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed" |
70 |
|
71 |
for x in "$@" ; do |
72 |
@@ -153,6 +154,9 @@ |
73 |
--no-uclibc) |
74 |
do_uclibc="no" |
75 |
;; |
76 |
+ --force) |
77 |
+ force="true" |
78 |
+ ;; |
79 |
*) |
80 |
eerror "Invalid elibtoolize option: ${x}" |
81 |
die "elibtoolize called with ${x} ??" |
82 |
@@ -186,9 +190,15 @@ |
83 |
for d in "$@" ; do |
84 |
export ELT_APPLIED_PATCHES= |
85 |
|
86 |
- [[ -f ${d}/.elibtoolized ]] && continue |
87 |
+ if [[ -f ${d}/.elibtoolized ]] ; then |
88 |
+ ${force} || continue |
89 |
+ fi |
90 |
|
91 |
einfo "Running elibtoolize in: ${d#${WORKDIR}/}/" |
92 |
+ if [[ -f ${d}/.elibtoolized ]] ; then |
93 |
+ ewarn " We've already been run in this tree; you should" |
94 |
+ ewarn " avoid this if possible (perhaps by filing a bug)" |
95 |
+ fi |
96 |
|
97 |
for p in ${elt_patches} ; do |
98 |
local ret=0 |