From a8b4d338a8dcddbf8e438620e2aea8fe82ffbbfd Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Wed, 9 Apr 2014 14:39:31 +0200
Subject: glibc: add patch for make-4.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 ...0004-Accept-make-versions-4.0-and-greater.patch | 35 ++++++++++++++++++++++
 patches/glibc-2.18/autogen.sh                      |  9 ------
 patches/glibc-2.18/series                          |  3 +-
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 patches/glibc-2.18/0004-Accept-make-versions-4.0-and-greater.patch
 delete mode 100755 patches/glibc-2.18/autogen.sh

diff --git a/patches/glibc-2.18/0004-Accept-make-versions-4.0-and-greater.patch b/patches/glibc-2.18/0004-Accept-make-versions-4.0-and-greater.patch
new file mode 100644
index 0000000..3206a74
--- /dev/null
+++ b/patches/glibc-2.18/0004-Accept-make-versions-4.0-and-greater.patch
@@ -0,0 +1,35 @@
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 31 Oct 2013 12:37:50 +1000
+Subject: [PATCH] Accept make versions 4.0 and greater
+
+---
+ configure    | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 1ee4c42..804fd7e 100755
+--- a/configure
++++ b/configure
+@@ -4772,7 +4772,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 769e8ef..2364142 100644
+--- a/configure.in
++++ b/configure.in
+@@ -989,7 +989,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.]*\)],
diff --git a/patches/glibc-2.18/autogen.sh b/patches/glibc-2.18/autogen.sh
deleted file mode 100755
index 2f7a28e..0000000
--- a/patches/glibc-2.18/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# rebuild ./configure (required by
-# 0003-configure.in-detect-readelf-with-AC_CHECK_TARGET_TOO.patch) but do not
-# use autoreconf, this does not work on every system correctly. Even makefiles
-# do it that way!
-chmod +w configure
-autoconf configure.in > configure
-
diff --git a/patches/glibc-2.18/series b/patches/glibc-2.18/series
index 0b9efc8..53c39ad 100644
--- a/patches/glibc-2.18/series
+++ b/patches/glibc-2.18/series
@@ -4,6 +4,7 @@
 0001-ARM-Fix-clone-code-when-built-for-Thumb.patch
 0002-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pth.patch
 0003-ARM-Fix-memcpy-computed-jump-calculations-for-ARM_AL.patch
+0004-Accept-make-versions-4.0-and-greater.patch
 #tag:build-system --start-number 100
 0100-add-install-lib-all-target.patch
 0101-don-t-regen-docs-if-perl-is-not-found.patch
@@ -14,4 +15,4 @@
 #tag:linaro --start-number 400
 0400-optimized-string-functions-for-NEON-from-Linaro.patch
 0401-add-libc_hidden_builtin_def-for-all-cortex-functions.patch
-# e5c3f673218a3a66a1d6604118b68f8b  - git-ptx-patches magic
+# 7774ed95c0f12c240b0659960d7c2f7d  - git-ptx-patches magic
-- 
cgit v1.2.3