summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-11-04 17:31:15 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:25:34 +0000
commit3a162de35694360b33f33e0e9122339eb92c7779 (patch)
treeb88fb46d437f165fc7274f570abe49c929573ae4 /meta
parent25443599ba615ca6f61fe30650b300ef6c898d82 (diff)
downloadpoky-3a162de35694360b33f33e0e9122339eb92c7779.tar.gz
eglibc_2.18.bb: accept make versions 4.0 and greater
[YOCTO #5391] (From OE-Core rev: 1969ff9081d06109b7e8e7f9331f31fcb611c393) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.18/make-4.patch31
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.18.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/make-4.patch b/meta/recipes-core/eglibc/eglibc-2.18/make-4.patch
new file mode 100644
index 0000000000..ec105b4ae2
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.18/make-4.patch
@@ -0,0 +1,31 @@
1Accept make versions 4.0 and greater
2
3Backport of glibc 28d708c44bc47b56f6551ff285f78edcf61c208a.
4
5Upstream-Status: Backport
6Signed-off-by: Jonathan Liu <net147@gmail.com>
7
8diff -Nur libc.orig/configure libc/configure
9--- libc.orig/configure 2013-08-21 02:23:48.000000000 +1000
10+++ libc/configure 2013-11-04 17:04:17.778333748 +1100
11@@ -4772,7 +4772,7 @@
12 ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
13 case $ac_prog_version in
14 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
15- 3.79* | 3.[89]*)
16+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
17 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
18 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
19
20diff -Nur libc.orig/configure.in libc/configure.in
21--- libc.orig/configure.in 2013-08-21 02:23:48.000000000 +1000
22+++ libc/configure.in 2013-11-04 16:54:17.955014870 +1100
23@@ -989,7 +989,7 @@
24 critic_missing="$critic_missing gcc")
25 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
26 [GNU Make[^0-9]*\([0-9][0-9.]*\)],
27- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
28+ [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
29
30 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
31 [GNU gettext.* \([0-9]*\.[0-9.]*\)],
diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
index 710b498a4d..15e5eed3ff 100644
--- a/meta/recipes-core/eglibc/eglibc_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
@@ -27,6 +27,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23
27 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ 27 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
28 file://fix-tibetian-locales.patch \ 28 file://fix-tibetian-locales.patch \
29 file://0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch \ 29 file://0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch \
30 file://make-4.patch \
30 " 31 "
31SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" 32SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
32SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" 33SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"