summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-11-04 06:31:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-12 20:32:22 (GMT)
commit5b12a3441b859b3b12bb1e7b61acf97a1cfa8c08 (patch)
tree859f5aa7ac8b3a0ab0c25b23ddb2351091170d14
parent48d151851ed5c3dc4c8620680237a07661ce2c6f (diff)
downloadpoky-5b12a3441b859b3b12bb1e7b61acf97a1cfa8c08.tar.gz
eglibc_2.17.bb: accept make versions 4.0 and greater
(From OE-Core rev: b111824a28fadbd58468a83279aaa7da3eaa98be) 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>
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/make-4.patch31
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.17.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.17/make-4.patch b/meta/recipes-core/eglibc/eglibc-2.17/make-4.patch
new file mode 100644
index 0000000..8349c18
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.17/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 2012-12-03 08:11:45.000000000 +1100
10+++ libc/configure 2013-11-04 17:15:31.344984184 +1100
11@@ -4995,7 +4995,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 2012-12-03 08:11:45.000000000 +1100
22+++ libc/configure.in 2013-11-04 17:15:31.351650849 +1100
23@@ -958,7 +958,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.17.bb b/meta/recipes-core/eglibc/eglibc_2.17.bb
index 22129e6..c62ff36 100644
--- a/meta/recipes-core/eglibc/eglibc_2.17.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.17.bb
@@ -28,6 +28,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr22
28 file://tzselect-awk.patch \ 28 file://tzselect-awk.patch \
29 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ 29 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
30 file://fix-tibetian-locales.patch \ 30 file://fix-tibetian-locales.patch \
31 file://make-4.patch \
31 ${BACKPORTS} \ 32 ${BACKPORTS} \
32 " 33 "
33BACKPORTS = "\ 34BACKPORTS = "\