arrfab / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone
Blob Blame History Raw
#
# BZ #16037
#
# Allow building glibc with make version 4.0 or greater.
# This facilitates testing and QE on non-RHEL environments during
# patch development.
#
# commit 28d708c44bc47b56f6551ff285f78edcf61c208a
# Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
# Date:   Thu Oct 31 12:37:50 2013 +1000
#
#    Accept make versions 4.0 and greater
#
diff -urN glibc-2.17-c758a686/configure glibc-2.17-c758a686/configure
--- glibc-2.17-c758a686/configure	2015-01-15 16:32:14.983435268 -0500
+++ glibc-2.17-c758a686/configure	2015-01-15 16:32:45.396495266 -0500
@@ -4991,7 +4991,7 @@
   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 -urN glibc-2.17-c758a686/configure.in glibc-2.17-c758a686/configure.in
--- glibc-2.17-c758a686/configure.in	2015-01-15 16:32:14.781441511 -0500
+++ glibc-2.17-c758a686/configure.in	2015-01-15 16:32:34.970817501 -0500
@@ -945,7 +945,7 @@
   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.]*\)],