diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch | 236 |
1 files changed, 236 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch new file mode 100644 index 0000000000..dbb6d674d5 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch | |||
@@ -0,0 +1,236 @@ | |||
1 | From 4a1ff3c313645aa425a0a87459c907dad1b9ca4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 18 Mar 2015 00:31:06 +0000 | ||
4 | Subject: [PATCH] 'yes' within the path sets wrong config variables | ||
5 | |||
6 | It seems that the 'AC_EGREP_CPP(yes...' example is quite popular | ||
7 | but being such a short word to grep it is likely to produce | ||
8 | false-positive matches with the path it is configured into. | ||
9 | |||
10 | The change is to use a more elaborated string to grep for. | ||
11 | |||
12 | Upstream-Status: Submitted [libc-alpha@sourceware.org] | ||
13 | |||
14 | Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com> | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | sysdeps/aarch64/configure | 4 ++-- | ||
18 | sysdeps/aarch64/configure.ac | 4 ++-- | ||
19 | sysdeps/arm/configure | 4 ++-- | ||
20 | sysdeps/arm/configure.ac | 4 ++-- | ||
21 | sysdeps/mips/configure | 4 ++-- | ||
22 | sysdeps/mips/configure.ac | 4 ++-- | ||
23 | sysdeps/unix/sysv/linux/mips/configure | 4 ++-- | ||
24 | sysdeps/unix/sysv/linux/mips/configure.ac | 4 ++-- | ||
25 | sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 8 ++++---- | ||
26 | sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | 8 ++++---- | ||
27 | 10 files changed, 24 insertions(+), 24 deletions(-) | ||
28 | mode change 100644 => 100755 sysdeps/arm/configure | ||
29 | mode change 100644 => 100755 sysdeps/mips/configure | ||
30 | mode change 100644 => 100755 sysdeps/unix/sysv/linux/mips/configure | ||
31 | mode change 100644 => 100755 sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
32 | |||
33 | diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure | ||
34 | index 4bd5496a4a..6c051369fb 100755 | ||
35 | --- a/sysdeps/aarch64/configure | ||
36 | +++ b/sysdeps/aarch64/configure | ||
37 | @@ -157,12 +157,12 @@ else case e in #( | ||
38 | e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
39 | /* end confdefs.h. */ | ||
40 | #ifdef __AARCH64EB__ | ||
41 | - yes | ||
42 | + is_aarch64_be | ||
43 | #endif | ||
44 | |||
45 | _ACEOF | ||
46 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
47 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 | ||
48 | + $EGREP_TRADITIONAL "is_aarch64_be" >/dev/null 2>&1 | ||
49 | then : | ||
50 | libc_cv_aarch64_be=yes | ||
51 | else case e in #( | ||
52 | diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac | ||
53 | index 56d12d661d..80fca20873 100644 | ||
54 | --- a/sysdeps/aarch64/configure.ac | ||
55 | +++ b/sysdeps/aarch64/configure.ac | ||
56 | @@ -13,8 +13,8 @@ AC_DEFINE(SUPPORT_STATIC_PIE) | ||
57 | # the dynamic linker via %ifdef. | ||
58 | AC_CACHE_CHECK([for big endian], | ||
59 | [libc_cv_aarch64_be], | ||
60 | - [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ | ||
61 | - yes | ||
62 | + [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__ | ||
63 | + is_aarch64_be | ||
64 | #endif | ||
65 | ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) | ||
66 | if test $libc_cv_aarch64_be = yes; then | ||
67 | diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure | ||
68 | old mode 100644 | ||
69 | new mode 100755 | ||
70 | index 935e022c74..9f7c98bcd3 | ||
71 | --- a/sysdeps/arm/configure | ||
72 | +++ b/sysdeps/arm/configure | ||
73 | @@ -153,12 +153,12 @@ else case e in #( | ||
74 | e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
75 | /* end confdefs.h. */ | ||
76 | #ifdef __ARM_PCS_VFP | ||
77 | - yes | ||
78 | + use_arm_pcs_vfp | ||
79 | #endif | ||
80 | |||
81 | _ACEOF | ||
82 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
83 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 | ||
84 | + $EGREP_TRADITIONAL "use_arm_pcs_vfp" >/dev/null 2>&1 | ||
85 | then : | ||
86 | libc_cv_arm_pcs_vfp=yes | ||
87 | else case e in #( | ||
88 | diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac | ||
89 | index cd00ddc9d9..d3831867ac 100644 | ||
90 | --- a/sysdeps/arm/configure.ac | ||
91 | +++ b/sysdeps/arm/configure.ac | ||
92 | @@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. | ||
93 | # the dynamic linker via %ifdef. | ||
94 | AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], | ||
95 | [libc_cv_arm_pcs_vfp], | ||
96 | - [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP | ||
97 | - yes | ||
98 | + [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP | ||
99 | + use_arm_pcs_vfp | ||
100 | #endif | ||
101 | ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) | ||
102 | if test $libc_cv_arm_pcs_vfp = yes; then | ||
103 | diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure | ||
104 | old mode 100644 | ||
105 | new mode 100755 | ||
106 | index 60dbd947e2..e3d10d7b96 | ||
107 | --- a/sysdeps/mips/configure | ||
108 | +++ b/sysdeps/mips/configure | ||
109 | @@ -150,11 +150,11 @@ else case e in #( | ||
110 | /* end confdefs.h. */ | ||
111 | dnl | ||
112 | #ifdef __mips_nan2008 | ||
113 | -yes | ||
114 | +use_mips_nan2008 | ||
115 | #endif | ||
116 | _ACEOF | ||
117 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
118 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 | ||
119 | + $EGREP_TRADITIONAL "use_mips_nan2008" >/dev/null 2>&1 | ||
120 | then : | ||
121 | libc_cv_mips_nan2008=yes | ||
122 | else case e in #( | ||
123 | diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac | ||
124 | index d3cd780d78..250223d206 100644 | ||
125 | --- a/sysdeps/mips/configure.ac | ||
126 | +++ b/sysdeps/mips/configure.ac | ||
127 | @@ -6,9 +6,9 @@ dnl position independent way. | ||
128 | AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC) | ||
129 | |||
130 | AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], | ||
131 | - libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl | ||
132 | + libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl | ||
133 | #ifdef __mips_nan2008 | ||
134 | -yes | ||
135 | +use_mips_nan2008 | ||
136 | #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) | ||
137 | if test x$libc_cv_mips_nan2008 = xyes; then | ||
138 | AC_DEFINE(HAVE_MIPS_NAN2008) | ||
139 | diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure | ||
140 | old mode 100644 | ||
141 | new mode 100755 | ||
142 | index 6e3402c111..a23f24ef8e | ||
143 | --- a/sysdeps/unix/sysv/linux/mips/configure | ||
144 | +++ b/sysdeps/unix/sysv/linux/mips/configure | ||
145 | @@ -443,11 +443,11 @@ else case e in #( | ||
146 | /* end confdefs.h. */ | ||
147 | dnl | ||
148 | #ifdef __mips_nan2008 | ||
149 | -yes | ||
150 | +use_mips_nan2008 | ||
151 | #endif | ||
152 | _ACEOF | ||
153 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
154 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 | ||
155 | + $EGREP_TRADITIONAL "use_mips_nan2008" >/dev/null 2>&1 | ||
156 | then : | ||
157 | libc_cv_mips_nan2008=yes | ||
158 | else case e in #( | ||
159 | diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac | ||
160 | index 049a0f4bdf..005526d4e8 100644 | ||
161 | --- a/sysdeps/unix/sysv/linux/mips/configure.ac | ||
162 | +++ b/sysdeps/unix/sysv/linux/mips/configure.ac | ||
163 | @@ -105,9 +105,9 @@ AC_COMPILE_IFELSE( | ||
164 | LIBC_CONFIG_VAR([mips-mode-switch],[${libc_mips_mode_switch}]) | ||
165 | |||
166 | AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], | ||
167 | - libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl | ||
168 | + libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl | ||
169 | #ifdef __mips_nan2008 | ||
170 | -yes | ||
171 | +use_mips_nan2008 | ||
172 | #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) | ||
173 | |||
174 | libc_mips_nan= | ||
175 | diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
176 | old mode 100644 | ||
177 | new mode 100755 | ||
178 | index 5dd70689fc..7d6c2322d3 | ||
179 | --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
180 | +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
181 | @@ -160,12 +160,12 @@ else case e in #( | ||
182 | e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
183 | /* end confdefs.h. */ | ||
184 | #if _CALL_ELF == 2 | ||
185 | - yes | ||
186 | + use_ppc_elfv2_abi | ||
187 | #endif | ||
188 | |||
189 | _ACEOF | ||
190 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
191 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 | ||
192 | + $EGREP_TRADITIONAL "use_ppc_elfv2_abi" >/dev/null 2>&1 | ||
193 | then : | ||
194 | libc_cv_ppc64_elfv2_abi=yes | ||
195 | else case e in #( | ||
196 | @@ -197,12 +197,12 @@ else case e in #( | ||
197 | e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
198 | /* end confdefs.h. */ | ||
199 | #ifdef _CALL_ELF | ||
200 | - yes | ||
201 | + is_def_call_elf | ||
202 | #endif | ||
203 | |||
204 | _ACEOF | ||
205 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
206 | - $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 | ||
207 | + $EGREP_TRADITIONAL "is_def_call_elf" >/dev/null 2>&1 | ||
208 | then : | ||
209 | libc_cv_ppc64_def_call_elf=yes | ||
210 | else case e in #( | ||
211 | diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | ||
212 | index f9cba6e15d..b21f72f1e4 100644 | ||
213 | --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | ||
214 | +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | ||
215 | @@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64]) | ||
216 | # Define default-abi according to compiler flags. | ||
217 | AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI], | ||
218 | [libc_cv_ppc64_elfv2_abi], | ||
219 | - [AC_EGREP_CPP(yes,[#if _CALL_ELF == 2 | ||
220 | - yes | ||
221 | + [AC_EGREP_CPP(use_ppc_elfv2_abi,[#if _CALL_ELF == 2 | ||
222 | + use_ppc_elfv2_abi | ||
223 | #endif | ||
224 | ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)]) | ||
225 | if test $libc_cv_ppc64_elfv2_abi = yes; then | ||
226 | @@ -19,8 +19,8 @@ else | ||
227 | # Compiler that do not support ELFv2 ABI does not define _CALL_ELF | ||
228 | AC_CACHE_CHECK([whether the compiler defines _CALL_ELF], | ||
229 | [libc_cv_ppc64_def_call_elf], | ||
230 | - [AC_EGREP_CPP(yes,[#ifdef _CALL_ELF | ||
231 | - yes | ||
232 | + [AC_EGREP_CPP(is_def_call_elf,[#ifdef _CALL_ELF | ||
233 | + is_def_call_elf | ||
234 | #endif | ||
235 | ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) | ||
236 | if test $libc_cv_ppc64_def_call_elf = no; then | ||