[gentoo-commits] gentoo commit in src/patchsets/glibc/2.17: 0059_all_glibc-2.19-make-4.0.patch

[gentoo-commits] gentoo commit in src/patchsets/glibc/2.17: 0059_all_glibc-2.19-make-4.0.patch

[Mike Frysinger (vapier)]

vapier      13/11/23 05:18:21

  Added:                0059_all_glibc-2.19-make-4.0.patch
  Log:
  add fix from upstream for build failures w/make-4 #487906 by Lars Wendler

Revision  Changes    Path
1.1                  src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch?rev=1.1&content-type=text/plain

Index: 0059_all_glibc-2.19-make-4.0.patch
===================================================================
https://bugs.gentoo.org/487906
https://sourceware.org/bugzilla/show_bug.cgi?id=16037

From 28d708c44bc47b56f6551ff285f78edcf61c208a Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 31 Oct 2013 12:37:50 +1000
Subject: [PATCH] Accept make versions 4.0 and greater

---
 ChangeLog    | 6 ++++++
 NEWS         | 2 +-
 configure    | 2 +-
 configure.in | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

2013-10-31  Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

	[BZ #16037]
	* configure.in: allow GNU Make 4.0 and greater.
	* configure: Regenerated.

diff --git a/configure b/configure
index f382138..5e61abd 100755
--- a/configure
+++ b/configure
@@ -4761,7 +4761,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 49b70fd..6da8efd 100644
--- a/configure.in
+++ b/configure.in
@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
   critic_missing="$critic_missing gcc")
 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
-  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
 
 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-- 
1.8.4.3

[gentoo-commits] gentoo commit in src/patchsets/glibc/2.17: 0059_all_glibc-2.19-make-4.0.patch

[Mike Frysinger (vapier)]

vapier      14/03/25 17:42:26

  Modified:             0059_all_glibc-2.19-make-4.0.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.17/0059_all_glibc-2.19-make-4.0.patch

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
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
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

Index: 0059_all_glibc-2.19-make-4.0.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.17/0059_all_glibc-2.19-make-4.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0059_all_glibc-2.19-make-4.0.patch	23 Nov 2013 05:18:21 -0000	1.1
+++ 0059_all_glibc-2.19-make-4.0.patch	25 Mar 2014 17:42:26 -0000	1.2
@@ -19,19 +19,6 @@
 	* configure.in: allow GNU Make 4.0 and greater.
 	* configure: Regenerated.
 
-diff --git a/configure b/configure
-index f382138..5e61abd 100755
---- a/configure
-+++ b/configure
-@@ -4761,7 +4761,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 49b70fd..6da8efd 100644
 --- a/configure.in
@@ -45,6 +32,19 @@
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+diff --git a/configure b/configure
+index f382138..5e61abd 100755
+--- a/configure
++++ b/configure
+@@ -4761,7 +4761,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