1 |
vapier 14/03/25 17:42:26 |
2 |
|
3 |
Modified: |
4 |
00_all_0015-Accept-make-versions-4.0-and-greater.patch |
5 |
Log: |
6 |
re-order patch so we modify configure.in first, then configure. this way the timestamp of configure stays newer than configure.in. |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: 00_all_0015-Accept-make-versions-4.0-and-greater.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- 00_all_0015-Accept-make-versions-4.0-and-greater.patch 24 Nov 2013 17:41:12 -0000 1.1 |
22 |
+++ 00_all_0015-Accept-make-versions-4.0-and-greater.patch 25 Mar 2014 17:42:26 -0000 1.2 |
23 |
@@ -11,19 +11,6 @@ |
24 |
configure.in | 2 +- |
25 |
2 files changed, 2 insertions(+), 2 deletions(-) |
26 |
|
27 |
-diff --git a/configure b/configure |
28 |
-index 1ee4c42..804fd7e 100755 |
29 |
---- a/configure |
30 |
-+++ b/configure |
31 |
-@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } |
32 |
- ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` |
33 |
- case $ac_prog_version in |
34 |
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
35 |
-- 3.79* | 3.[89]*) |
36 |
-+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*) |
37 |
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; |
38 |
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; |
39 |
- |
40 |
diff --git a/configure.in b/configure.in |
41 |
index 769e8ef..2364142 100644 |
42 |
--- a/configure.in |
43 |
@@ -37,6 +24,19 @@ |
44 |
|
45 |
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, |
46 |
[GNU gettext.* \([0-9]*\.[0-9.]*\)], |
47 |
+diff --git a/configure b/configure |
48 |
+index 1ee4c42..804fd7e 100755 |
49 |
+--- a/configure |
50 |
++++ b/configure |
51 |
+@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } |
52 |
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` |
53 |
+ case $ac_prog_version in |
54 |
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
55 |
+- 3.79* | 3.[89]*) |
56 |
++ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*) |
57 |
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; |
58 |
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; |
59 |
+ |
60 |
-- |
61 |
1.8.4.3 |