diff options
author | Jonathan Liu <net147@gmail.com> | 2013-11-04 17:31:39 +1100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:11 +0000 |
commit | 252ab00746745f2e8066828c7adb28803a8e7303 (patch) | |
tree | c7168624c7d854f7bd1f1d0449c6448921b00420 /meta/recipes-core/eglibc/eglibc-2.17 | |
parent | 7a0761caa2b36885262a4da36b60a72aa58bf124 (diff) | |
download | poky-252ab00746745f2e8066828c7adb28803a8e7303.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.17')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.17/make-4.patch | 31 |
1 files changed, 31 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 0000000000..8349c18dc2 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.17/make-4.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Accept make versions 4.0 and greater | ||
2 | |||
3 | Backport of glibc 28d708c44bc47b56f6551ff285f78edcf61c208a. | ||
4 | |||
5 | Upstream-Status: Backport | ||
6 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
7 | |||
8 | diff -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 | |||
20 | diff -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.]*\)], | ||