vapier 14/03/25 17:42:26
Modified:
00_all_0015-Accept-make-versions-4.0-and-greater.patch
Log:
re-order patch so we modify configure.in first, then configure. this way the
timestamp of configure stays newer than configure.in.
Revision Changes Path
1.2
src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch
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
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
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
Index: 00_all_0015-Accept-make-versions-4.0-and-greater.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/glibc/2.18/00_all_0015-Accept-make-versions-4.0-and-greater.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 00_all_0015-Accept-make-versions-4.0-and-greater.patch 24 Nov 2013
17:41:12 -0000 1.1
+++ 00_all_0015-Accept-make-versions-4.0-and-greater.patch 25 Mar 2014
17:42:26 -0000 1.2
@@ -11,19 +11,6 @@
configure.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/configure b/configure
-index 1ee4c42..804fd7e 100755
---- a/configure
-+++ b/configure
-@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
- ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU
Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-- 3.79* | 3.[89]*)
-+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
diff --git a/configure.in b/configure.in
index 769e8ef..2364142 100644
--- a/configure.in
@@ -37,6 +24,19 @@
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
[GNU gettext.* \([0-9]*\.[0-9.]*\)],
+diff --git a/configure b/configure
+index 1ee4c42..804fd7e 100755
+--- a/configure
++++ b/configure
+@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU
Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 3.79* | 3.[89]*)
++ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
--
1.8.4.3
