From: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
To: Khem Raj <raj.khem@gmail.com>
Cc: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] glibc: 'yes' within the path sets wrong variables
Date: Mon, 02 Mar 2015 10:10:04 -0600 [thread overview]
Message-ID: <1425312604.3431.2.camel@besquive-mobl.amr.corp.intel.com> (raw)
In-Reply-To: <CAMKF1srbEK6RLR7TTNCK7WeR1AV5mOE=3=rjBRB85MWcX3wLWQ@mail.gmail.com>
On Thu, 2015-02-26 at 08:18 -0800, Khem Raj wrote:
> On Mon, Feb 23, 2015 at 1:54 AM, Benjamin Esquivel
> <benjamin.esquivel@linux.intel.com> wrote:
> > The pre-processed output of conftest.c contains an include dir
> > and if the path of it contains a 'yes' it will cause some variables
> > to be wrongly set to yes because of the way it greps for it.
> > The fix is to use a more elaborated string instead of just 'yes'.
> > This has to be done at the configure and the configure.ac files,
> > normally it would only require the configure.ac changes but they
> > also need modification given the configure files also pop-out of
> > the source tarball.
> >
> > [YOCTO #6614]
>
> looks good. Mark it upstreamable, and send it to glibc ml as well.
>
will do
> >
> > Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
> > ---
> > meta/recipes-core/glibc/glibc/fix-yesdir.patch | 230 +++++++++++++++++++++++++
> > meta/recipes-core/glibc/glibc_2.21.bb | 1 +
> > 2 files changed, 231 insertions(+)
> > create mode 100644 meta/recipes-core/glibc/glibc/fix-yesdir.patch
> >
> > diff --git a/meta/recipes-core/glibc/glibc/fix-yesdir.patch b/meta/recipes-core/glibc/glibc/fix-yesdir.patch
> > new file mode 100644
> > index 0000000..4d014c0
> > --- /dev/null
> > +++ b/meta/recipes-core/glibc/glibc/fix-yesdir.patch
> > @@ -0,0 +1,230 @@
> > +Index: git/sysdeps/arm/configure
> > +===================================================================
> > +--- git.orig/sysdeps/arm/configure
> > ++++ git/sysdeps/arm/configure
> > +@@ -150,12 +150,12 @@ else
> > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > + /* end confdefs.h. */
> > + #ifdef __ARM_PCS_VFP
> > +- yes
> > ++ use_arm_pcs_vfp
> > + #endif
> > +
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1; then :
> > + libc_cv_arm_pcs_vfp=yes
> > + else
> > + libc_cv_arm_pcs_vfp=no
> > +Index: git/sysdeps/arm/configure.ac
> > +===================================================================
> > +--- git.orig/sysdeps/arm/configure.ac
> > ++++ git/sysdeps/arm/configure.ac
> > +@@ -16,8 +16,8 @@ dnl it. Until we do, don't define it.
> > + # the dynamic linker via %ifdef.
> > + AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI],
> > + [libc_cv_arm_pcs_vfp],
> > +- [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP
> > +- yes
> > ++ [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP
> > ++ use_arm_pcs_vfp
> > + #endif
> > + ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
> > + if test $libc_cv_arm_pcs_vfp = yes; then
> > +Index: git/sysdeps/aarch64/configure
> > +===================================================================
> > +--- git.orig/sysdeps/aarch64/configure
> > ++++ git/sysdeps/aarch64/configure
> > +@@ -148,12 +148,12 @@ else
> > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > + /* end confdefs.h. */
> > + #ifdef __AARCH64EB__
> > +- yes
> > ++ is_aarch64_be
> > + #endif
> > +
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "is_aarch64_be" >/dev/null 2>&1; then :
> > + libc_cv_aarch64_be=yes
> > + else
> > + libc_cv_aarch64_be=no
> > +Index: git/sysdeps/aarch64/configure.ac
> > +===================================================================
> > +--- git.orig/sysdeps/aarch64/configure.ac
> > ++++ git/sysdeps/aarch64/configure.ac
> > +@@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the
> > + # the dynamic linker via %ifdef.
> > + AC_CACHE_CHECK([for big endian],
> > + [libc_cv_aarch64_be],
> > +- [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__
> > +- yes
> > ++ [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__
> > ++ is_aarch64_be
> > + #endif
> > + ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)])
> > + if test $libc_cv_aarch64_be = yes; then
> > +Index: git/sysdeps/mips/configure
> > +===================================================================
> > +--- git.orig/sysdeps/mips/configure
> > ++++ git/sysdeps/mips/configure
> > +@@ -143,11 +143,11 @@ else
> > + /* end confdefs.h. */
> > + dnl
> > + #ifdef __mips_nan2008
> > +-yes
> > ++use_mips_nan2008
> > + #endif
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then :
> > + libc_cv_mips_nan2008=yes
> > + else
> > + libc_cv_mips_nan2008=no
> > +Index: git/sysdeps/mips/configure.ac
> > +===================================================================
> > +--- git.orig/sysdeps/mips/configure.ac
> > ++++ git/sysdeps/mips/configure.ac
> > +@@ -6,9 +6,9 @@ dnl position independent way.
> > + dnl AC_DEFINE(PI_STATIC_AND_HIDDEN)
> > +
> > + AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding],
> > +- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl
> > ++ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl
> > + #ifdef __mips_nan2008
> > +-yes
> > ++use_mips_nan2008
> > + #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)])
> > + if test x$libc_cv_mips_nan2008 = xyes; then
> > + AC_DEFINE(HAVE_MIPS_NAN2008)
> > +Index: git/sysdeps/nios2/configure
> > +===================================================================
> > +--- git.orig/sysdeps/nios2/configure
> > ++++ git/sysdeps/nios2/configure
> > +@@ -142,12 +142,12 @@ else
> > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > + /* end confdefs.h. */
> > + #ifdef __nios2_big_endian__
> > +- yes
> > ++ is_nios2_be
> > + #endif
> > +
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "is_nios2_be" >/dev/null 2>&1; then :
> > + libc_cv_nios2_be=yes
> > + else
> > + libc_cv_nios2_be=no
> > +Index: git/sysdeps/nios2/configure.ac
> > +===================================================================
> > +--- git.orig/sysdeps/nios2/configure.ac
> > ++++ git/sysdeps/nios2/configure.ac
> > +@@ -4,8 +4,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the
> > + # Nios II big endian is not yet supported.
> > + AC_CACHE_CHECK([for big endian],
> > + [libc_cv_nios2_be],
> > +- [AC_EGREP_CPP(yes,[#ifdef __nios2_big_endian__
> > +- yes
> > ++ [AC_EGREP_CPP(is_nios2_be,[#ifdef __nios2_big_endian__
> > ++ is_nios2_be
> > + #endif
> > + ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)])
> > + if test $libc_cv_nios2_be = yes; then
> > +Index: git/sysdeps/unix/sysv/linux/mips/configure
> > +===================================================================
> > +--- git.orig/sysdeps/unix/sysv/linux/mips/configure
> > ++++ git/sysdeps/unix/sysv/linux/mips/configure
> > +@@ -387,11 +387,11 @@ else
> > + /* end confdefs.h. */
> > + dnl
> > + #ifdef __mips_nan2008
> > +-yes
> > ++use_mips_nan2008
> > + #endif
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then :
> > + libc_cv_mips_nan2008=yes
> > + else
> > + libc_cv_mips_nan2008=no
> > +Index: git/sysdeps/unix/sysv/linux/mips/configure.ac
> > +===================================================================
> > +--- git.orig/sysdeps/unix/sysv/linux/mips/configure.ac
> > ++++ git/sysdeps/unix/sysv/linux/mips/configure.ac
> > +@@ -98,9 +98,9 @@ AC_COMPILE_IFELSE(
> > + LIBC_CONFIG_VAR([mips-mode-switch],[${libc_mips_mode_switch}])
> > +
> > + AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding],
> > +- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl
> > ++ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl
> > + #ifdef __mips_nan2008
> > +-yes
> > ++use_mips_nan2008
> > + #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)])
> > +
> > + libc_mips_nan=
> > +Index: git/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
> > +===================================================================
> > +--- git.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
> > ++++ git/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
> > +@@ -155,12 +155,12 @@ else
> > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > + /* end confdefs.h. */
> > + #if _CALL_ELF == 2
> > +- yes
> > ++ use_ppc_elfv2_abi
> > + #endif
> > +
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "use_ppc_elfv2_abi" >/dev/null 2>&1; then :
> > + libc_cv_ppc64_elfv2_abi=yes
> > + else
> > + libc_cv_ppc64_elfv2_abi=no
> > +@@ -188,12 +188,12 @@ else
> > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> > + /* end confdefs.h. */
> > + #ifdef _CALL_ELF
> > +- yes
> > ++ is_def_call_elf
> > + #endif
> > +
> > + _ACEOF
> > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> > +- $EGREP "yes" >/dev/null 2>&1; then :
> > ++ $EGREP "is_def_call_elf" >/dev/null 2>&1; then :
> > + libc_cv_ppc64_def_call_elf=yes
> > + else
> > + libc_cv_ppc64_def_call_elf=no
> > +Index: git/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
> > +===================================================================
> > +--- git.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
> > ++++ git/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
> > +@@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64])
> > + # Define default-abi according to compiler flags.
> > + AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI],
> > + [libc_cv_ppc64_elfv2_abi],
> > +- [AC_EGREP_CPP(yes,[#if _CALL_ELF == 2
> > +- yes
> > ++ [AC_EGREP_CPP(use_ppc_elfv2_abi,[#if _CALL_ELF == 2
> > ++ use_ppc_elfv2_abi
> > + #endif
> > + ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)])
> > + if test $libc_cv_ppc64_elfv2_abi = yes; then
> > +@@ -19,8 +19,8 @@ else
> > + # Compiler that do not support ELFv2 ABI does not define _CALL_ELF
> > + AC_CACHE_CHECK([whether the compiler defines _CALL_ELF],
> > + [libc_cv_ppc64_def_call_elf],
> > +- [AC_EGREP_CPP(yes,[#ifdef _CALL_ELF
> > +- yes
> > ++ [AC_EGREP_CPP(is_def_call_elf,[#ifdef _CALL_ELF
> > ++ is_def_call_elf
> > + #endif
> > + ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])
> > + if test $libc_cv_ppc64_def_call_elf = no; then
> > diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
> > index 1ef494b..d7aab4b 100644
> > --- a/meta/recipes-core/glibc/glibc_2.21.bb
> > +++ b/meta/recipes-core/glibc/glibc_2.21.bb
> > @@ -24,6 +24,7 @@ SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH} \
> > file://fix_am_rootsbindir.patch \
> > file://0001-Add-unused-attribute.patch \
> > file://0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch \
> > + file://fix-yesdir.patch \
> > ${EGLIBCPATCHES} \
> > "
> > EGLIBCPATCHES = "\
> > --
> > 1.8.4.5
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
prev parent reply other threads:[~2015-03-02 16:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-23 9:54 [PATCH] glibc: 'yes' within the path sets wrong variables Benjamin Esquivel
2015-02-24 19:40 ` Saul Wold
2015-02-24 22:17 ` Benjamin Esquivel
2015-02-25 12:23 ` Burton, Ross
2015-02-25 18:14 ` Benjamin Esquivel
2015-02-26 12:22 ` Burton, Ross
2015-02-26 16:17 ` Khem Raj
2015-03-02 16:02 ` [meta-oe][PATCH v2] " Benjamin Esquivel
2015-03-05 8:17 ` [PATCH v3] " Benjamin Esquivel
2015-03-02 16:09 ` [PATCH] " Benjamin Esquivel
2015-02-26 16:18 ` Khem Raj
2015-03-02 16:10 ` Benjamin Esquivel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425312604.3431.2.camel@besquive-mobl.amr.corp.intel.com \
--to=benjamin.esquivel@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.