|
 |
147e83 |
#
|
|
|
147e83 |
# BZ #16037
|
|
|
147e83 |
#
|
|
|
147e83 |
# Allow building glibc with make version 4.0 or greater.
|
|
|
147e83 |
# This facilitates testing and QE on non-RHEL environments during
|
|
|
147e83 |
# patch development.
|
|
|
147e83 |
#
|
|
|
147e83 |
# commit 28d708c44bc47b56f6551ff285f78edcf61c208a
|
|
|
147e83 |
# Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
|
|
147e83 |
# Date: Thu Oct 31 12:37:50 2013 +1000
|
|
|
147e83 |
#
|
|
|
147e83 |
# Accept make versions 4.0 and greater
|
|
|
147e83 |
#
|
|
|
147e83 |
diff -urN glibc-2.17-c758a686/configure glibc-2.17-c758a686/configure
|
|
|
147e83 |
--- glibc-2.17-c758a686/configure 2015-01-15 16:32:14.983435268 -0500
|
|
|
147e83 |
+++ glibc-2.17-c758a686/configure 2015-01-15 16:32:45.396495266 -0500
|
|
|
147e83 |
@@ -4991,7 +4991,7 @@
|
|
|
147e83 |
ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
|
|
|
147e83 |
case $ac_prog_version in
|
|
|
147e83 |
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
|
147e83 |
- 3.79* | 3.[89]*)
|
|
|
147e83 |
+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
|
|
|
147e83 |
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
|
147e83 |
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
|
147e83 |
|
|
|
147e83 |
diff -urN glibc-2.17-c758a686/configure.in glibc-2.17-c758a686/configure.in
|
|
|
147e83 |
--- glibc-2.17-c758a686/configure.in 2015-01-15 16:32:14.781441511 -0500
|
|
|
147e83 |
+++ glibc-2.17-c758a686/configure.in 2015-01-15 16:32:34.970817501 -0500
|
|
|
147e83 |
@@ -945,7 +945,7 @@
|
|
|
147e83 |
critic_missing="$critic_missing gcc")
|
|
|
147e83 |
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
|
|
|
147e83 |
[GNU Make[^0-9]*\([0-9][0-9.]*\)],
|
|
|
147e83 |
- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
|
|
|
147e83 |
+ [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
|
|
|
147e83 |
|
|
|
147e83 |
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
|
|
|
147e83 |
[GNU gettext.* \([0-9]*\.[0-9.]*\)],
|