From 86d2f1364a42f8fdd34842275d8e3d221989eb4f Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 18 Feb 2016 14:41:01 +0100 Subject: glibc-2.14.1: add make 4.x build fix Signed-off-by: Michael Olbrich --- ...0024-Accept-make-versions-4.0-and-greater.patch | 35 ++++++++++++++++++++++ patches/glibc-2.14.1/series | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 patches/glibc-2.14.1/0024-Accept-make-versions-4.0-and-greater.patch diff --git a/patches/glibc-2.14.1/0024-Accept-make-versions-4.0-and-greater.patch b/patches/glibc-2.14.1/0024-Accept-make-versions-4.0-and-greater.patch new file mode 100644 index 0000000..335fdcb --- /dev/null +++ b/patches/glibc-2.14.1/0024-Accept-make-versions-4.0-and-greater.patch @@ -0,0 +1,35 @@ +From: Marc-Antoine Perennou +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 6890fb0..75a1cef 100644 --- a/patches/glibc-2.14.1/series +++ b/patches/glibc-2.14.1/series @@ -23,4 +23,5 @@ 0021-fix-libdl-crash.patch 0022-__glibc_unlikely-New-macro-to-wrap-cases-where-__bui.patch 0023-CVE-2015-7547-getaddrinfo-stack-based-buffer-overflo.patch -# 76b9ca1dedff60a59910b3deee3a0b52 - git-ptx-patches magic +0024-Accept-make-versions-4.0-and-greater.patch +# 43a15f65257a4355916838b463cc5be8 - git-ptx-patches magic -- cgit v1.2.3