1 |
vapier 13/11/23 05:18:21 |
2 |
|
3 |
Added: 0059_all_glibc-2.19-make-4.0.patch |
4 |
Log: |
5 |
add fix from upstream for build failures w/make-4 #487906 by Lars Wendler |
6 |
|
7 |
Revision Changes Path |
8 |
1.1 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.1&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.1&content-type=text/plain |
12 |
|
13 |
Index: 0059_all_glibc-2.19-make-4.0.patch |
14 |
=================================================================== |
15 |
https://bugs.gentoo.org/487906 |
16 |
https://sourceware.org/bugzilla/show_bug.cgi?id=16037 |
17 |
|
18 |
From 28d708c44bc47b56f6551ff285f78edcf61c208a Mon Sep 17 00:00:00 2001 |
19 |
From: Marc-Antoine Perennou <Marc-Antoine@××××××××.com> |
20 |
Date: Thu, 31 Oct 2013 12:37:50 +1000 |
21 |
Subject: [PATCH] Accept make versions 4.0 and greater |
22 |
|
23 |
--- |
24 |
ChangeLog | 6 ++++++ |
25 |
NEWS | 2 +- |
26 |
configure | 2 +- |
27 |
configure.in | 2 +- |
28 |
4 files changed, 9 insertions(+), 3 deletions(-) |
29 |
|
30 |
2013-10-31 Marc-Antoine Perennou <Marc-Antoine@××××××××.com> |
31 |
|
32 |
[BZ #16037] |
33 |
* configure.in: allow GNU Make 4.0 and greater. |
34 |
* configure: Regenerated. |
35 |
|
36 |
diff --git a/configure b/configure |
37 |
index f382138..5e61abd 100755 |
38 |
--- a/configure |
39 |
+++ b/configure |
40 |
@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; } |
41 |
ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` |
42 |
case $ac_prog_version in |
43 |
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
44 |
- 3.79* | 3.[89]*) |
45 |
+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*) |
46 |
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; |
47 |
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; |
48 |
|
49 |
diff --git a/configure.in b/configure.in |
50 |
index 49b70fd..6da8efd 100644 |
51 |
--- a/configure.in |
52 |
+++ b/configure.in |
53 |
@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, |
54 |
critic_missing="$critic_missing gcc") |
55 |
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version, |
56 |
[GNU Make[^0-9]*\([0-9][0-9.]*\)], |
57 |
- [3.79* | 3.[89]*], critic_missing="$critic_missing make") |
58 |
+ [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make") |
59 |
|
60 |
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version, |
61 |
[GNU gettext.* \([0-9]*\.[0-9.]*\)], |
62 |
-- |
63 |
1.8.4.3 |