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 | 260 |
1 files changed, 260 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..364e5cfde8 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch | |||
@@ -0,0 +1,260 @@ | |||
1 | From 2192588942c5bc3b5fa10fc6d7433923f42e9ba0 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/nios2/configure | 4 ++-- | ||
24 | sysdeps/nios2/configure.ac | 4 ++-- | ||
25 | sysdeps/unix/sysv/linux/mips/configure | 4 ++-- | ||
26 | sysdeps/unix/sysv/linux/mips/configure.ac | 4 ++-- | ||
27 | sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 8 ++++---- | ||
28 | sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | 8 ++++---- | ||
29 | 12 files changed, 28 insertions(+), 28 deletions(-) | ||
30 | |||
31 | diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure | ||
32 | index ca57edce47..5e91fab023 100644 | ||
33 | --- a/sysdeps/aarch64/configure | ||
34 | +++ b/sysdeps/aarch64/configure | ||
35 | @@ -165,12 +165,12 @@ else $as_nop | ||
36 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
37 | /* end confdefs.h. */ | ||
38 | #ifdef __AARCH64EB__ | ||
39 | - yes | ||
40 | + is_aarch64_be | ||
41 | #endif | ||
42 | |||
43 | _ACEOF | ||
44 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
45 | - $EGREP "yes" >/dev/null 2>&1 | ||
46 | + $EGREP "is_aarch64_be" >/dev/null 2>&1 | ||
47 | then : | ||
48 | libc_cv_aarch64_be=yes | ||
49 | else $as_nop | ||
50 | diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac | ||
51 | index 27874eceb4..8a708f2ef4 100644 | ||
52 | --- a/sysdeps/aarch64/configure.ac | ||
53 | +++ b/sysdeps/aarch64/configure.ac | ||
54 | @@ -13,8 +13,8 @@ AC_DEFINE(SUPPORT_STATIC_PIE) | ||
55 | # the dynamic linker via %ifdef. | ||
56 | AC_CACHE_CHECK([for big endian], | ||
57 | [libc_cv_aarch64_be], | ||
58 | - [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ | ||
59 | - yes | ||
60 | + [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__ | ||
61 | + is_aarch64_be | ||
62 | #endif | ||
63 | ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) | ||
64 | if test $libc_cv_aarch64_be = yes; then | ||
65 | diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure | ||
66 | index 35e2918922..94d7fbe8bb 100644 | ||
67 | --- a/sysdeps/arm/configure | ||
68 | +++ b/sysdeps/arm/configure | ||
69 | @@ -161,12 +161,12 @@ else $as_nop | ||
70 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
71 | /* end confdefs.h. */ | ||
72 | #ifdef __ARM_PCS_VFP | ||
73 | - yes | ||
74 | + use_arm_pcs_vfp | ||
75 | #endif | ||
76 | |||
77 | _ACEOF | ||
78 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
79 | - $EGREP "yes" >/dev/null 2>&1 | ||
80 | + $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1 | ||
81 | then : | ||
82 | libc_cv_arm_pcs_vfp=yes | ||
83 | else $as_nop | ||
84 | diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac | ||
85 | index 5172e30bbe..f06dedd7c5 100644 | ||
86 | --- a/sysdeps/arm/configure.ac | ||
87 | +++ b/sysdeps/arm/configure.ac | ||
88 | @@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. | ||
89 | # the dynamic linker via %ifdef. | ||
90 | AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], | ||
91 | [libc_cv_arm_pcs_vfp], | ||
92 | - [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP | ||
93 | - yes | ||
94 | + [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP | ||
95 | + use_arm_pcs_vfp | ||
96 | #endif | ||
97 | ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) | ||
98 | if test $libc_cv_arm_pcs_vfp = yes; then | ||
99 | diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure | ||
100 | index 1e8c6711e6..ae52ccd929 100644 | ||
101 | --- a/sysdeps/mips/configure | ||
102 | +++ b/sysdeps/mips/configure | ||
103 | @@ -158,11 +158,11 @@ else $as_nop | ||
104 | /* end confdefs.h. */ | ||
105 | dnl | ||
106 | #ifdef __mips_nan2008 | ||
107 | -yes | ||
108 | +use_mips_nan2008 | ||
109 | #endif | ||
110 | _ACEOF | ||
111 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
112 | - $EGREP "yes" >/dev/null 2>&1 | ||
113 | + $EGREP "use_mips_nan2008" >/dev/null 2>&1 | ||
114 | then : | ||
115 | libc_cv_mips_nan2008=yes | ||
116 | else $as_nop | ||
117 | diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac | ||
118 | index d3cd780d78..250223d206 100644 | ||
119 | --- a/sysdeps/mips/configure.ac | ||
120 | +++ b/sysdeps/mips/configure.ac | ||
121 | @@ -6,9 +6,9 @@ dnl position independent way. | ||
122 | AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC) | ||
123 | |||
124 | AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], | ||
125 | - libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl | ||
126 | + libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl | ||
127 | #ifdef __mips_nan2008 | ||
128 | -yes | ||
129 | +use_mips_nan2008 | ||
130 | #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) | ||
131 | if test x$libc_cv_mips_nan2008 = xyes; then | ||
132 | AC_DEFINE(HAVE_MIPS_NAN2008) | ||
133 | diff --git a/sysdeps/nios2/configure b/sysdeps/nios2/configure | ||
134 | index 2fb230cbaa..1959d0a444 100644 | ||
135 | --- a/sysdeps/nios2/configure | ||
136 | +++ b/sysdeps/nios2/configure | ||
137 | @@ -155,12 +155,12 @@ else $as_nop | ||
138 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
139 | /* end confdefs.h. */ | ||
140 | #ifdef __nios2_big_endian__ | ||
141 | - yes | ||
142 | + is_nios2_be | ||
143 | #endif | ||
144 | |||
145 | _ACEOF | ||
146 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
147 | - $EGREP "yes" >/dev/null 2>&1 | ||
148 | + $EGREP "is_nios2_be" >/dev/null 2>&1 | ||
149 | then : | ||
150 | libc_cv_nios2_be=yes | ||
151 | else $as_nop | ||
152 | diff --git a/sysdeps/nios2/configure.ac b/sysdeps/nios2/configure.ac | ||
153 | index f738e9a7ed..4085851cbc 100644 | ||
154 | --- a/sysdeps/nios2/configure.ac | ||
155 | +++ b/sysdeps/nios2/configure.ac | ||
156 | @@ -4,8 +4,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. | ||
157 | # Nios II big endian is not yet supported. | ||
158 | AC_CACHE_CHECK([for big endian], | ||
159 | [libc_cv_nios2_be], | ||
160 | - [AC_EGREP_CPP(yes,[#ifdef __nios2_big_endian__ | ||
161 | - yes | ||
162 | + [AC_EGREP_CPP(is_nios2_be,[#ifdef __nios2_big_endian__ | ||
163 | + is_nios2_be | ||
164 | #endif | ||
165 | ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)]) | ||
166 | if test $libc_cv_nios2_be = yes; then | ||
167 | diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure | ||
168 | index a060901de4..0ac7019438 100644 | ||
169 | --- a/sysdeps/unix/sysv/linux/mips/configure | ||
170 | +++ b/sysdeps/unix/sysv/linux/mips/configure | ||
171 | @@ -441,11 +441,11 @@ else $as_nop | ||
172 | /* end confdefs.h. */ | ||
173 | dnl | ||
174 | #ifdef __mips_nan2008 | ||
175 | -yes | ||
176 | +use_mips_nan2008 | ||
177 | #endif | ||
178 | _ACEOF | ||
179 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
180 | - $EGREP "yes" >/dev/null 2>&1 | ||
181 | + $EGREP "use_mips_nan2008" >/dev/null 2>&1 | ||
182 | then : | ||
183 | libc_cv_mips_nan2008=yes | ||
184 | else $as_nop | ||
185 | diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac | ||
186 | index 049a0f4bdf..005526d4e8 100644 | ||
187 | --- a/sysdeps/unix/sysv/linux/mips/configure.ac | ||
188 | +++ b/sysdeps/unix/sysv/linux/mips/configure.ac | ||
189 | @@ -105,9 +105,9 @@ AC_COMPILE_IFELSE( | ||
190 | LIBC_CONFIG_VAR([mips-mode-switch],[${libc_mips_mode_switch}]) | ||
191 | |||
192 | AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], | ||
193 | - libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl | ||
194 | + libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl | ||
195 | #ifdef __mips_nan2008 | ||
196 | -yes | ||
197 | +use_mips_nan2008 | ||
198 | #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) | ||
199 | |||
200 | libc_mips_nan= | ||
201 | diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
202 | index cf1b70c745..0dccf6cd76 100644 | ||
203 | --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
204 | +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | ||
205 | @@ -168,12 +168,12 @@ else $as_nop | ||
206 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
207 | /* end confdefs.h. */ | ||
208 | #if _CALL_ELF == 2 | ||
209 | - yes | ||
210 | + use_ppc_elfv2_abi | ||
211 | #endif | ||
212 | |||
213 | _ACEOF | ||
214 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
215 | - $EGREP "yes" >/dev/null 2>&1 | ||
216 | + $EGREP "use_ppc_elfv2_abi" >/dev/null 2>&1 | ||
217 | then : | ||
218 | libc_cv_ppc64_elfv2_abi=yes | ||
219 | else $as_nop | ||
220 | @@ -203,12 +203,12 @@ else $as_nop | ||
221 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
222 | /* end confdefs.h. */ | ||
223 | #ifdef _CALL_ELF | ||
224 | - yes | ||
225 | + is_def_call_elf | ||
226 | #endif | ||
227 | |||
228 | _ACEOF | ||
229 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
230 | - $EGREP "yes" >/dev/null 2>&1 | ||
231 | + $EGREP "is_def_call_elf" >/dev/null 2>&1 | ||
232 | then : | ||
233 | libc_cv_ppc64_def_call_elf=yes | ||
234 | else $as_nop | ||
235 | diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | ||
236 | index f9cba6e15d..b21f72f1e4 100644 | ||
237 | --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | ||
238 | +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | ||
239 | @@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64]) | ||
240 | # Define default-abi according to compiler flags. | ||
241 | AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI], | ||
242 | [libc_cv_ppc64_elfv2_abi], | ||
243 | - [AC_EGREP_CPP(yes,[#if _CALL_ELF == 2 | ||
244 | - yes | ||
245 | + [AC_EGREP_CPP(use_ppc_elfv2_abi,[#if _CALL_ELF == 2 | ||
246 | + use_ppc_elfv2_abi | ||
247 | #endif | ||
248 | ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)]) | ||
249 | if test $libc_cv_ppc64_elfv2_abi = yes; then | ||
250 | @@ -19,8 +19,8 @@ else | ||
251 | # Compiler that do not support ELFv2 ABI does not define _CALL_ELF | ||
252 | AC_CACHE_CHECK([whether the compiler defines _CALL_ELF], | ||
253 | [libc_cv_ppc64_def_call_elf], | ||
254 | - [AC_EGREP_CPP(yes,[#ifdef _CALL_ELF | ||
255 | - yes | ||
256 | + [AC_EGREP_CPP(is_def_call_elf,[#ifdef _CALL_ELF | ||
257 | + is_def_call_elf | ||
258 | #endif | ||
259 | ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) | ||
260 | if test $libc_cv_ppc64_def_call_elf = no; then | ||