[OE-core] [PATCH] eglibc_2.17.bb: accept make versions 4.0 and greater

[Jonathan Liu]

On 4/11/2013 11:35 PM, Jack Mitchell wrote:
> On 04/11/13 06:31, Jonathan Liu wrote:
>> Signed-off-by: Jonathan Liu <net147 at gmail.com>
>> ---
>>   meta/recipes-core/eglibc/eglibc-2.17/make-4.patch | 31 +++++++++++++++++++++++
>>   meta/recipes-core/eglibc/eglibc_2.17.bb           |  1 +
>>   2 files changed, 32 insertions(+)
>>   create mode 100644 meta/recipes-core/eglibc/eglibc-2.17/make-4.patch
>>
>> 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 @@
>> +Accept make versions 4.0 and greater
>> +
>> +Backport of glibc 28d708c44bc47b56f6551ff285f78edcf61c208a.
>> +
>> +Upstream-Status: Backport
>> +Signed-off-by: Jonathan Liu <net147 at gmail.com>
>> +
>> +diff -Nur libc.orig/configure libc/configure
>> +--- libc.orig/configure	2012-12-03 08:11:45.000000000 +1100
>> ++++ libc/configure	2013-11-04 17:15:31.344984184 +1100
>> +@@ -4995,7 +4995,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	2012-12-03 08:11:45.000000000 +1100
>> ++++ libc/configure.in	2013-11-04 17:15:31.351650849 +1100
>> +@@ -958,7 +958,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.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
>>              file://tzselect-awk.patch \
>>              file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
>>              file://fix-tibetian-locales.patch \
>> +           file://make-4.patch \
>>              ${BACKPORTS} \
>>             "
>>   BACKPORTS = "\
>>
> Jonathan,
>
> Does this actually build and work on your system? I have had issues with
> make 4.0 and autotools 2.69 which lead to a failed configure/compile.
>
> Cheers,
>
I was able to build eglibc 2.18 and compile images for my x86 target 
successfully.

Relevant output from configure:
checking version of make... 4.0, ok
...
checking for autoconf... autoconf
checking whether autoconf works... no
configure: WARNING:
*** These auxiliary programs are missing or incompatible versions: autoconf
*** some features will be disabled.
*** Check the INSTALL file for required versions.

I don't build any SDKs though.

Regards,
Jonathan