| 1 |
leio 08/09/27 09:16:33 |
| 2 |
|
| 3 |
Modified: gnome2-utils.eclass |
| 4 |
Log: |
| 5 |
Sort the list of Makefile.am and Makefile.in files used in gnome2_omf_fix(), so that |
| 6 |
it is ensured the .am one is listed before the respective .in for maintainer mode |
| 7 |
regeneration to not kick in due to modtime of .am being newer than .in and the listed files |
| 8 |
being possibly patched with sed for a scrollkeeper fix. |
| 9 |
This maintainer mode build file regeneration is reliably reproducable only if PORTAGE_TMPDIR |
| 10 |
is on a filesystem with jiffies-granularity timestamps - tmpfs in particular. In the common |
| 11 |
case (ext3 and reiserfs) it is only second-granularity and GNU make rule dependency for |
| 12 |
am--refresh doesn't trigger almost never because the timestamp is equal unless it hits a |
| 13 |
second boundary pretty exactly in the middle. This should fix bug 236649 and all the few dozen |
| 14 |
INVALID bugs Diego Pettenò has filed against GNOME packages that claim the maintainer mode |
| 15 |
rebuild is caused by patches in $FILESDIR, while it must have been simply the omf_fix combined |
| 16 |
with tmpfs usage. |
| 17 |
|
| 18 |
Revision Changes Path |
| 19 |
1.11 eclass/gnome2-utils.eclass |
| 20 |
|
| 21 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.11&view=markup |
| 22 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.11&content-type=text/plain |
| 23 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.10&r2=1.11 |
| 24 |
|
| 25 |
Index: gnome2-utils.eclass |
| 26 |
=================================================================== |
| 27 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v |
| 28 |
retrieving revision 1.10 |
| 29 |
retrieving revision 1.11 |
| 30 |
diff -u -r1.10 -r1.11 |
| 31 |
--- gnome2-utils.eclass 22 Mar 2008 17:30:11 -0000 1.10 |
| 32 |
+++ gnome2-utils.eclass 27 Sep 2008 09:16:32 -0000 1.11 |
| 33 |
@@ -1,6 +1,6 @@ |
| 34 |
# Copyright 1999-2006 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.10 2008/03/22 17:30:11 remi Exp $ |
| 37 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.11 2008/09/27 09:16:32 leio Exp $ |
| 38 |
|
| 39 |
# |
| 40 |
# gnome2-utils.eclass |
| 41 |
@@ -179,7 +179,9 @@ |
| 42 |
fi |
| 43 |
|
| 44 |
# testing fixing of all makefiles found |
| 45 |
- for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am") ; do |
| 46 |
+ # The sort is important to ensure .am is listed before the respective .in for |
| 47 |
+ # maintainer mode regeneration not kicking in due to .am being newer than .in |
| 48 |
+ for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am" |sort) ; do |
| 49 |
omf_makefiles="${omf_makefiles} ${filename}" |
| 50 |
done |
Archives