1 |
mgorny 12/02/02 22:01:13 |
2 |
|
3 |
Modified: ChangeLog autotools-utils.eclass |
4 |
Log: |
5 |
Use checksums to determine whether files need autoreconf. Fixes bug #399641. |
6 |
|
7 |
Revision Changes Path |
8 |
1.112 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.112&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.112&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.111&r2=1.112 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.111 |
18 |
retrieving revision 1.112 |
19 |
diff -u -r1.111 -r1.112 |
20 |
--- ChangeLog 2 Feb 2012 03:17:56 -0000 1.111 |
21 |
+++ ChangeLog 2 Feb 2012 22:01:13 -0000 1.112 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.111 2012/02/02 03:17:56 floppym Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.112 2012/02/02 22:01:13 mgorny Exp $ |
27 |
+ |
28 |
+ 02 Feb 2012; Michał Górny <mgorny@g.o> autotools-utils.eclass: |
29 |
+ Use checksums to determine whether files need autoreconf. Fixes bug #399641. |
30 |
|
31 |
02 Feb 2012; Mike Gilbert <floppym@g.o> subversion.eclass: |
32 |
Introduce ESVN_UMASK variable to override default umask. Patch by Arfrever. |
33 |
|
34 |
|
35 |
|
36 |
1.47 eclass/autotools-utils.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.47&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.47&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.46&r2=1.47 |
41 |
|
42 |
Index: autotools-utils.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v |
45 |
retrieving revision 1.46 |
46 |
retrieving revision 1.47 |
47 |
diff -u -r1.46 -r1.47 |
48 |
--- autotools-utils.eclass 30 Jan 2012 13:11:27 -0000 1.46 |
49 |
+++ autotools-utils.eclass 2 Feb 2012 22:01:13 -0000 1.47 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.46 2012/01/30 13:11:27 jlec Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.47 2012/02/02 22:01:13 mgorny Exp $ |
55 |
|
56 |
# @ECLASS: autotools-utils.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -362,14 +362,17 @@ |
59 |
|
60 |
[[ ${PATCHES} ]] && epatch "${PATCHES[@]}" |
61 |
|
62 |
- touch "${T}"/.autotools-utils.timestamp || die |
63 |
+ at_checksum() { |
64 |
+ find '(' -name 'Makefile.am' \ |
65 |
+ -o -name 'configure.ac' \ |
66 |
+ -o -name 'configure.in' ')' \ |
67 |
+ -exec cksum {} + | sort -k2 |
68 |
+ } |
69 |
+ |
70 |
+ [[ ! ${want_autoreconf} ]] && local checksum=$(at_checksum) |
71 |
epatch_user |
72 |
if [[ ! ${want_autoreconf} ]]; then |
73 |
- if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \ |
74 |
- -a '(' -name 'Makefile.am' \ |
75 |
- -o -name 'configure.ac' \ |
76 |
- -o -name 'configure.in' ')' \ |
77 |
- -print -quit) ]]; then |
78 |
+ if [[ ${checksum} != $(at_checksum) ]]; then |
79 |
einfo 'Will autoreconfigure due to user patches applied.' |
80 |
want_autoreconf=yep |
81 |
fi |