mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-20 05:17:54 +00:00
ac4a37c8c4
This partially reverts commit 429b3e8846.
Bring back the patches for glibc 2.12 and newer. Propagate/refresh
some patches as needed.
Signed-off-by: Alexey Neyman <stilor@att.net>
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
Original patch modified: Removed ChangeLog and NEWS sections, ajdust for configure.in
|
|
KS
|
|
|
|
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
|
Date: Thu, 31 Oct 2013 02:37:50 +0000 (+1000)
|
|
Subject: Accept make versions 4.0 and greater
|
|
X-Git-Tag: glibc-2.19~556
|
|
X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=28d708c44bc47b56f6551ff285f78edcf61c208a;hp=a56ee40b176d0a3f47f2a7eb75208f2e3763c9fd
|
|
|
|
Accept make versions 4.0 and greater
|
|
---
|
|
|
|
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.]*\)],
|