diff mbox

Fix to egrep for yes$ to avoid matching it on include paths

Message ID 1408939644-79389-1-git-send-email-benjamin.esquivel@linux.intel.com
State Superseded
Headers show

Commit Message

Benjamin Esquivel Aug. 25, 2014, 4:07 a.m. UTC
For the pre-processed output of conftest.c when it contains an include dir and
if the path of it contains a 'yes' it will cause some variables to be wrongly
set because of the way it greps for it. Fix is to egrep for yes$ instead
---
 sysdeps/aarch64/configure                              | 2 +-
 sysdeps/aarch64/configure.ac                           | 2 +-
 sysdeps/arm/configure                                  | 2 +-
 sysdeps/arm/configure.ac                               | 2 +-
 sysdeps/mips/configure                                 | 2 +-
 sysdeps/mips/configure.ac                              | 2 +-
 sysdeps/unix/sysv/linux/mips/configure                 | 2 +-
 sysdeps/unix/sysv/linux/mips/configure.ac              | 2 +-
 sysdeps/unix/sysv/linux/powerpc/powerpc64/configure    | 4 ++--
 sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | 4 ++--
 10 files changed, 12 insertions(+), 12 deletions(-)

Comments

Andreas Schwab Aug. 25, 2014, 4:45 p.m. UTC | #1
Benjamin Esquivel <benjamin.esquivel@linux.intel.com> writes:

> diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
> index 7851dd4..6002697 100644
> --- a/sysdeps/aarch64/configure.ac
> +++ b/sysdeps/aarch64/configure.ac
> @@ -10,7 +10,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
>  # the dynamic linker via %ifdef.
>  AC_CACHE_CHECK([for big endian],
>    [libc_cv_aarch64_be],
> -  [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__
> +  [AC_EGREP_CPP(yes$$,[#ifdef __AARCH64EB__
>                        yes
>                       #endif

It would be more robust to use AC_PREPROC_IFELSE and #error.

Andreas.
diff mbox

Patch

diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
index af870b7..57ffe64 100644
--- a/sysdeps/aarch64/configure
+++ b/sysdeps/aarch64/configure
@@ -153,7 +153,7 @@  else
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes$" >/dev/null 2>&1; then :
   libc_cv_aarch64_be=yes
 else
   libc_cv_aarch64_be=no
diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
index 7851dd4..6002697 100644
--- a/sysdeps/aarch64/configure.ac
+++ b/sysdeps/aarch64/configure.ac
@@ -10,7 +10,7 @@  GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # the dynamic linker via %ifdef.
 AC_CACHE_CHECK([for big endian],
   [libc_cv_aarch64_be],
-  [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__
+  [AC_EGREP_CPP(yes$$,[#ifdef __AARCH64EB__
                       yes
                      #endif
   ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)])
diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure
index fe86006..2eeb596 100644
--- a/sysdeps/arm/configure
+++ b/sysdeps/arm/configure
@@ -155,7 +155,7 @@  else
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes$" >/dev/null 2>&1; then :
   libc_cv_arm_pcs_vfp=yes
 else
   libc_cv_arm_pcs_vfp=no
diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac
index 86c0c08..afc5eab 100644
--- a/sysdeps/arm/configure.ac
+++ b/sysdeps/arm/configure.ac
@@ -16,7 +16,7 @@  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
+  [AC_EGREP_CPP(yes$$,[#ifdef __ARM_PCS_VFP
                       yes
                      #endif
   ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure
index f3f5d2e..46cccd6 100644
--- a/sysdeps/mips/configure
+++ b/sysdeps/mips/configure
@@ -147,7 +147,7 @@  yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes$" >/dev/null 2>&1; then :
   libc_cv_mips_nan2008=yes
 else
   libc_cv_mips_nan2008=no
diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac
index bcbdaff..7ed1d3b 100644
--- a/sysdeps/mips/configure.ac
+++ b/sysdeps/mips/configure.ac
@@ -6,7 +6,7 @@  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(yes$$, [dnl
 #ifdef __mips_nan2008
 yes
 #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)])
diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
index 7fac4f4..97d11b5 100644
--- a/sysdeps/unix/sysv/linux/mips/configure
+++ b/sysdeps/unix/sysv/linux/mips/configure
@@ -249,7 +249,7 @@  yes
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes$" >/dev/null 2>&1; then :
   libc_cv_mips_nan2008=yes
 else
   libc_cv_mips_nan2008=no
diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac
index c3f217a..ea5726b 100644
--- a/sysdeps/unix/sysv/linux/mips/configure.ac
+++ b/sysdeps/unix/sysv/linux/mips/configure.ac
@@ -45,7 +45,7 @@  if test -z "$libc_mips_float"; then
 fi
 
 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(yes$$, [dnl
 #ifdef __mips_nan2008
 yes
 #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)])
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
index aa1302a..14c91b5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
@@ -160,7 +160,7 @@  else
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes$" >/dev/null 2>&1; then :
   libc_cv_ppc64_elfv2_abi=yes
 else
   libc_cv_ppc64_elfv2_abi=no
@@ -190,7 +190,7 @@  else
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes$" >/dev/null 2>&1; then :
   libc_cv_ppc64_def_call_elf=yes
 else
   libc_cv_ppc64_def_call_elf=no
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
index de04689..1d8aeb7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
@@ -6,7 +6,7 @@  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
+  [AC_EGREP_CPP(yes$$,[#if _CALL_ELF == 2
                       yes
                      #endif
   ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)])
@@ -17,7 +17,7 @@  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
+    [AC_EGREP_CPP(yes$$,[#ifdef _CALL_ELF
                          yes
                        #endif
     ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])