From 612c14d58b54387ac904d9167c42ee75f6a4e8cf Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 22 Aug 2015 17:22:16 +0100 Subject: [PATCH] glibc: Fix build with make version 4.0 and greater Signed-off-by: Michael Tremer --- lfs/glibc | 1 + ...accept-make-versions-4.0-and-greater.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch diff --git a/lfs/glibc b/lfs/glibc index 3391d2d106..2341d10a95 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -290,6 +290,7 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch # Fixes: # Makefile:235: *** mixed implicit and normal rules. Stop. diff --git a/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch b/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch new file mode 100644 index 0000000000..7faf857faf --- /dev/null +++ b/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch @@ -0,0 +1,35 @@ +From 28d708c44bc47b56f6551ff285f78edcf61c208a Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Thu, 31 Oct 2013 12:37:50 +1000 +Subject: 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.]*\)], +-- +cgit v0.10.2 + -- 2.39.5