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.18: 00_all_0015-Accept-make-versions-4.0-and-greater.patch
Date: Sun, 24 Nov 2013 17:41:17
Message-Id: 20131124174112.7C8A72004B@flycatcher.gentoo.org
1 vapier 13/11/24 17:41:12
2
3 Added:
4 00_all_0015-Accept-make-versions-4.0-and-greater.patch
5 Log:
6 add fix from upstream for build failures w/make-4 #487906 by Lars Wendler
7
8 Revision Changes Path
9 1.1 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.1&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.1&content-type=text/plain
13
14 Index: 00_all_0015-Accept-make-versions-4.0-and-greater.patch
15 ===================================================================
16 From b15ad643798707d247598a765edfa0ac0e8088c5 Mon Sep 17 00:00:00 2001
17 From: Marc-Antoine Perennou <Marc-Antoine@××××××××.com>
18 Date: Thu, 31 Oct 2013 12:37:50 +1000
19 Subject: [PATCH 15/16] Accept make versions 4.0 and greater
20
21 URL: https://bugs.gentoo.org/487906
22
23 (cherry picked from commit 28d708c44bc47b56f6551ff285f78edcf61c208a)
24 ---
25 configure | 2 +-
26 configure.in | 2 +-
27 2 files changed, 2 insertions(+), 2 deletions(-)
28
29 diff --git a/configure b/configure
30 index 1ee4c42..804fd7e 100755
31 --- a/configure
32 +++ b/configure
33 @@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
34 ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
35 case $ac_prog_version in
36 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
37 - 3.79* | 3.[89]*)
38 + 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
39 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
40 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
41
42 diff --git a/configure.in b/configure.in
43 index 769e8ef..2364142 100644
44 --- a/configure.in
45 +++ b/configure.in
46 @@ -989,7 +989,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
47 critic_missing="$critic_missing gcc")
48 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
49 [GNU Make[^0-9]*\([0-9][0-9.]*\)],
50 - [3.79* | 3.[89]*], critic_missing="$critic_missing make")
51 + [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
52
53 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
54 [GNU gettext.* \([0-9]*\.[0-9.]*\)],
55 --
56 1.8.4.3