eglibc_2.17.bb: accept make versions 4.0 and greater

(From OE-Core master rev: a678243d6e4add90c1e9459da42de34d3724db5d)

(From OE-Core rev: 9d59ceab6e58b422caf8ad7a306ed546316d8c3a)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jonathan Liu 2013-11-04 17:31:39 +11:00 committed by Richard Purdie
parent 7a0761caa2
commit 252ab00746
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,31 @@
Accept make versions 4.0 and greater
Backport of glibc 28d708c44bc47b56f6551ff285f78edcf61c208a.
Upstream-Status: Backport
Signed-off-by: Jonathan Liu <net147@gmail.com>
diff -Nur libc.orig/configure libc/configure
--- libc.orig/configure 2012-12-03 08:11:45.000000000 +1100
+++ libc/configure 2013-11-04 17:15:31.344984184 +1100
@@ -4995,7 +4995,7 @@
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 -Nur libc.orig/configure.in libc/configure.in
--- libc.orig/configure.in 2012-12-03 08:11:45.000000000 +1100
+++ libc/configure.in 2013-11-04 17:15:31.351650849 +1100
@@ -958,7 +958,7 @@
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.]*\)],

View File

@ -28,6 +28,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr22
file://tzselect-awk.patch \
file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
file://fix-tibetian-locales.patch \
file://make-4.patch \
${BACKPORTS} \
"
BACKPORTS = "\