Re: [PATCH] eglibc_2.18.bb: accept make versions 4.0 and greater

From: Martin Jansa <martin.jansa@gmail.com>
To: Jonathan Liu <net147@gmail.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] eglibc_2.18.bb: accept make versions 4.0 and greater
Date: Mon, 4 Nov 2013 10:08:31 +0100	[thread overview]
Message-ID: <20131104090831.GC3684@jama> (raw)
In-Reply-To: <1383546675-23002-1-git-send-email-net147@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 3220 bytes --]

On Mon, Nov 04, 2013 at 05:31:15PM +1100, Jonathan Liu wrote:
> Signed-off-by: Jonathan Liu <net147@gmail.com>

Hi,

FYI: there is bug report for this:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5391

> ---
>  meta/recipes-core/eglibc/eglibc-2.18/make-4.patch | 31 +++++++++++++++++++++++
>  meta/recipes-core/eglibc/eglibc_2.18.bb           |  1 +
>  2 files changed, 32 insertions(+)
>  create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/make-4.patch
> 
> 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 0000000..ec105b4
> --- /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 710b498..15e5eed 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"
> -- 
> 1.8.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]