diff options
| author |   Jonathan Liu <net147@gmail.com> | 2013-11-04 17:31:15 +1100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:24:51 +0000 |
| commit | 1969ff9081d06109b7e8e7f9331f31fcb611c393 (patch) | |
| tree | 952a6763ed371dc175abdce6256250368f4eeb0c /meta/recipes-core/eglibc | |
| parent | 24089364c3d11665c9ac3210c1fa2488017b6b73 (diff) | |
| download | openembedded-core-1969ff9081d06109b7e8e7f9331f31fcb611c393.tar.gz | |
eglibc_2.18.bb: accept make versions 4.0 and greater
[YOCTO #5391]
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/eglibc')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.18/make-4.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.18.bb | 1 |
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 @@ +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 2013-08-21 02:23:48.000000000 +1000 ++++ libc/configure 2013-11-04 17:04:17.778333748 +1100 +@@ -4772,7 +4772,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 2013-08-21 02:23:48.000000000 +1000 ++++ libc/configure.in 2013-11-04 16:54:17.955014870 +1100 +@@ -989,7 +989,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.]*\)], 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 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://fix-tibetian-locales.patch \ file://0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch \ + file://make-4.patch \ " SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" |