Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/glibc/2.17: 0059_all_glibc-2.19-make-4.0.patch
Date: Tue, 25 Mar 2014 17:42:30
Message-Id: 20140325174226.A50372005C@flycatcher.gentoo.org
1 vapier 14/03/25 17:42:26
2
3 Modified: 0059_all_glibc-2.19-make-4.0.patch
4 Log:
5 re-order patch so we modify configure.in first, then configure. this way the timestamp of configure stays newer than configure.in.
6
7 Revision Changes Path
8 1.2 src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch?r1=1.1&r2=1.2
13
14 Index: 0059_all_glibc-2.19-make-4.0.patch
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- 0059_all_glibc-2.19-make-4.0.patch 23 Nov 2013 05:18:21 -0000 1.1
21 +++ 0059_all_glibc-2.19-make-4.0.patch 25 Mar 2014 17:42:26 -0000 1.2
22 @@ -19,19 +19,6 @@
23 * configure.in: allow GNU Make 4.0 and greater.
24 * configure: Regenerated.
25
26 -diff --git a/configure b/configure
27 -index f382138..5e61abd 100755
28 ---- a/configure
29 -+++ b/configure
30 -@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
31 - ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
32 - case $ac_prog_version in
33 - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
34 -- 3.79* | 3.[89]*)
35 -+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
36 - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
37 - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
38 -
39 diff --git a/configure.in b/configure.in
40 index 49b70fd..6da8efd 100644
41 --- a/configure.in
42 @@ -45,6 +32,19 @@
43
44 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
45 [GNU gettext.* \([0-9]*\.[0-9.]*\)],
46 +diff --git a/configure b/configure
47 +index f382138..5e61abd 100755
48 +--- a/configure
49 ++++ b/configure
50 +@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
51 + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
52 + case $ac_prog_version in
53 + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
54 +- 3.79* | 3.[89]*)
55 ++ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
56 + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
57 + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
58 +
59 --
60 1.8.4.3