summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <chris.packham@alliedtelesis.co.nz>2016-02-15 20:49:55 (GMT)
committerChris Packham <chris.packham@alliedtelesis.co.nz>2016-02-15 22:29:36 (GMT)
commite812493c6fb4e9ae7724b42a5bdbb97c05bd7575 (patch)
tree15dad049fa7cdd429e792035874899bbb7a7eede
parentced321f73c8373f4d3212bcaede7de073e3e27fe (diff)
libc/glibc: allow glibc-2.16.0 to build with GNU Make 4 or greater
Back port of upstream commit. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
-rw-r--r--patches/glibc/2.16.0/510-accept-make-versions-4.0-or-higher.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/glibc/2.16.0/510-accept-make-versions-4.0-or-higher.patch b/patches/glibc/2.16.0/510-accept-make-versions-4.0-or-higher.patch
new file mode 100644
index 0000000..c7a6eed
--- /dev/null
+++ b/patches/glibc/2.16.0/510-accept-make-versions-4.0-or-higher.patch
@@ -0,0 +1,34 @@
+From 28d708c44bc47b56f6551ff285f78edcf61c208a Mon Sep 17 00:00:00 2001
+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
+---
+diff --git a/configure b/configure
+index f382138..5e61abd 100755
+--- a/configure
++++ b/configure
+@@ -4761,7 +4761,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 49b70fd..6da8efd 100644
+--- a/configure.in
++++ b/configure.in
+@@ -984,7 +984,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.]*\)],
+--
+1.9.4
+