summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-02-18 14:41:01 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-02-19 08:36:14 +0100
commit36346fe3bce4e371a6e0111a769ccb1ccc16de1d (patch)
treef1987394d52589e0503759a28de81f95abd8ad47
parent703eb5ca3fe5ceef54b7bd44f882dfee21c54156 (diff)
downloadOSELAS.Toolchain-36346fe3bce4e371a6e0111a769ccb1ccc16de1d.tar.gz
glibc-2.14.1: add make 4.x build fix
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/glibc-2.14.1/0023-Accept-make-versions-4.0-and-greater.patch35
-rw-r--r--patches/glibc-2.14.1/series3
2 files changed, 37 insertions, 1 deletions
diff --git a/patches/glibc-2.14.1/0023-Accept-make-versions-4.0-and-greater.patch b/patches/glibc-2.14.1/0023-Accept-make-versions-4.0-and-greater.patch
new file mode 100644
index 0000000..335fdcb
--- /dev/null
+++ b/patches/glibc-2.14.1/0023-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 6cf85e5..c2571b5 100755
+--- a/configure
++++ b/configure
+@@ -5002,7 +5002,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 f13cba3..36dbbe4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1030,7 +1030,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.14.1/series b/patches/glibc-2.14.1/series
index c548eb5..b1fe16f 100644
--- a/patches/glibc-2.14.1/series
+++ b/patches/glibc-2.14.1/series
@@ -22,4 +22,5 @@
0020-revert-sunrpc-removal.patch
0021-fix-libdl-crash.patch
0022-CVE-2015-7547-getaddrinfo-stack-based-buffer-overflo.patch
-# 28ea81b891761677d43c35bc360cfe60 - git-ptx-patches magic
+0023-Accept-make-versions-4.0-and-greater.patch
+# ebeac317b4d74035c98ddd3cfd3e7b79 - git-ptx-patches magic