summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-02-18 14:39:06 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-02-19 08:36:13 +0100
commit03b33d5f48c6b5ea5b4ef960f31f84f682d19790 (patch)
tree57d07c5ab0a03d170505843cb1421bfb26a8cedc
parent067a0f328f836b0168864875b4dca7499c2d2528 (diff)
downloadOSELAS.Toolchain-03b33d5f48c6b5ea5b4ef960f31f84f682d19790.tar.gz
glibc-2.16: add make 4.x build fix
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/glibc-2.16.0/0401-Accept-make-versions-4.0-and-greater.patch35
-rw-r--r--patches/glibc-2.16.0/series3
2 files changed, 37 insertions, 1 deletions
diff --git a/patches/glibc-2.16.0/0401-Accept-make-versions-4.0-and-greater.patch b/patches/glibc-2.16.0/0401-Accept-make-versions-4.0-and-greater.patch
new file mode 100644
index 0000000..836df14
--- /dev/null
+++ b/patches/glibc-2.16.0/0401-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 aa7869f..ab55030 100755
+--- a/configure
++++ b/configure
+@@ -4845,7 +4845,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 5028e64..c53dbbb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -940,7 +940,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.16.0/series b/patches/glibc-2.16.0/series
index bb73d2f..115a1e0 100644
--- a/patches/glibc-2.16.0/series
+++ b/patches/glibc-2.16.0/series
@@ -12,4 +12,5 @@
0301-add-libc_hidden_builtin_def-for-all-cortex-functions.patch
#tag:upstream --start-number 400
0400-CVE-2015-7547-getaddrinfo-stack-based-buffer-overflo.patch
-# 0f8571d21f1974f49d5199804b386b09 - git-ptx-patches magic
+0401-Accept-make-versions-4.0-and-greater.patch
+# 3ba483ceacec84f914f29da1edd6ac18 - git-ptx-patches magic