[OE-core] [PATCH] eglibc: fix as and ld check in libc dir

[Martin Jansa]

On Wed, Jan 16, 2013 at 03:14:07PM +0100, Giuseppe CONDORELLI wrote:
> Fix routine to check as and ld version check in the configure, to allow system
> to correctly check for version 2.1x.

Does it build with gold now?
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-March/020310.html

> 
> Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli at st.com>
> ---
>  .../eglibc-2.16_fix_as_ld_ver_check.patch          |   23 ++++++++++++++++++++
>  meta/recipes-core/eglibc/eglibc_2.16.bb            |    3 +-
>  2 files changed, 25 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-core/eglibc/eglibc-2.16/eglibc-2.16_fix_as_ld_ver_check.patch
> 
> diff --git a/meta/recipes-core/eglibc/eglibc-2.16/eglibc-2.16_fix_as_ld_ver_check.patch b/meta/recipes-core/eglibc/eglibc-2.16/eglibc-2.16_fix_as_ld_ver_check.patch
> new file mode 100644
> index 0000000..a8a2344
> --- /dev/null
> +++ b/meta/recipes-core/eglibc/eglibc-2.16/eglibc-2.16_fix_as_ld_ver_check.patch
> @@ -0,0 +1,23 @@
> +Fix as and ld checking steps to allow system to correctly check 2.1x versions.
> +
> +Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli at st.com> 
> +--- libc.orig/configure	2013-01-16 12:07:18.146902148 +0100
> ++++ libc/configure	2013-01-16 12:08:10.598911559 +0100
> +@@ -4757,7 +4757,7 @@ $as_echo_n "checking version of $AS... "
> +   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
> +   case $ac_prog_version in
> +     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
> +-    2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
> ++    2.1[0-9]*|2.[2-9][0-9]*|[3-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;;
> + 
> +@@ -4820,7 +4820,7 @@ $as_echo_n "checking version of $LD... "
> +   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
> +   case $ac_prog_version in
> +     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
> +-    2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
> ++    2.1[0-9]*|2.[2-9][0-9]*|[3-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 --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
> index 2dcaceb..fbc1499 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.16.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
> @@ -33,6 +33,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21
>             file://tzselect-sh.patch \
>             file://tzselect-awk.patch \
>             file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
> +	   file://eglibc-2.16_fix_as_ld_ver_check.patch \

wrong indentation

>            "
>  
>  SRC_URI[tarball.md5sum] = "88894fa6e10e58e85fbd8134b8e486a8"
> @@ -69,7 +70,7 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
>  
>  GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
>  
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

this does not belong here

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20130116/11883265/attachment-0002.sig>