summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch245
-rw-r--r--meta/recipes-core/glibc/glibc_2.21.bb1
2 files changed, 246 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch
new file mode 100644
index 0000000000..827e980332
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch
@@ -0,0 +1,245 @@
1'yes' within the path sets wrong config variables
2
3It seems that the 'AC_EGREP_CPP(yes...' example is quite popular
4but being such a short word to grep it is likely to produce
5false-positive matches with the path it is configured into.
6
7The change is to use a more elaborated string to grep for.
8
9Upstream-Status: Submitted [libc-alpha@sourceware.org]
10
11Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
12---
13diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
14index 5bd355a..3bc5537 100644
15--- a/sysdeps/aarch64/configure
16+++ b/sysdeps/aarch64/configure
17@@ -148,12 +148,12 @@ else
18 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19 /* end confdefs.h. */
20 #ifdef __AARCH64EB__
21- yes
22+ is_aarch64_be
23 #endif
24
25 _ACEOF
26 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
27- $EGREP "yes" >/dev/null 2>&1; then :
28+ $EGREP "is_aarch64_be" >/dev/null 2>&1; then :
29 libc_cv_aarch64_be=yes
30 else
31 libc_cv_aarch64_be=no
32diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
33index 7851dd4..6e92381 100644
34--- a/sysdeps/aarch64/configure.ac
35+++ b/sysdeps/aarch64/configure.ac
36@@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
37 # the dynamic linker via %ifdef.
38 AC_CACHE_CHECK([for big endian],
39 [libc_cv_aarch64_be],
40- [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__
41- yes
42+ [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__
43+ is_aarch64_be
44 #endif
45 ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)])
46 if test $libc_cv_aarch64_be = yes; then
47diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure
48index 45667cc..0b2ef11 100644
49--- a/sysdeps/arm/configure
50+++ b/sysdeps/arm/configure
51@@ -150,12 +150,12 @@ else
52 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
53 /* end confdefs.h. */
54 #ifdef __ARM_PCS_VFP
55- yes
56+ use_arm_pcs_vfp
57 #endif
58
59 _ACEOF
60 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
61- $EGREP "yes" >/dev/null 2>&1; then :
62+ $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1; then :
63 libc_cv_arm_pcs_vfp=yes
64 else
65 libc_cv_arm_pcs_vfp=no
66diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac
67index 002b8ef..e1746a7 100644
68--- a/sysdeps/arm/configure.ac
69+++ b/sysdeps/arm/configure.ac
70@@ -16,8 +16,8 @@ dnl it. Until we do, don't define it.
71 # the dynamic linker via %ifdef.
72 AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI],
73 [libc_cv_arm_pcs_vfp],
74- [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP
75- yes
76+ [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP
77+ use_arm_pcs_vfp
78 #endif
79 ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
80 if test $libc_cv_arm_pcs_vfp = yes; then
81diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure
82index 4e13248..f14af95 100644
83--- a/sysdeps/mips/configure
84+++ b/sysdeps/mips/configure
85@@ -143,11 +143,11 @@ else
86 /* end confdefs.h. */
87 dnl
88 #ifdef __mips_nan2008
89-yes
90+use_mips_nan2008
91 #endif
92 _ACEOF
93 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
94- $EGREP "yes" >/dev/null 2>&1; then :
95+ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then :
96 libc_cv_mips_nan2008=yes
97 else
98 libc_cv_mips_nan2008=no
99diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac
100index bcbdaff..ad3057f 100644
101--- a/sysdeps/mips/configure.ac
102+++ b/sysdeps/mips/configure.ac
103@@ -6,9 +6,9 @@ dnl position independent way.
104 dnl AC_DEFINE(PI_STATIC_AND_HIDDEN)
105
106 AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding],
107- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl
108+ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl
109 #ifdef __mips_nan2008
110-yes
111+use_mips_nan2008
112 #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)])
113 if test x$libc_cv_mips_nan2008 = xyes; then
114 AC_DEFINE(HAVE_MIPS_NAN2008)
115diff --git a/sysdeps/nios2/configure b/sysdeps/nios2/configure
116index 14c8a3a..dde3814 100644
117--- a/sysdeps/nios2/configure
118+++ b/sysdeps/nios2/configure
119@@ -142,12 +142,12 @@ else
120 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
121 /* end confdefs.h. */
122 #ifdef __nios2_big_endian__
123- yes
124+ is_nios2_be
125 #endif
126
127 _ACEOF
128 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
129- $EGREP "yes" >/dev/null 2>&1; then :
130+ $EGREP "is_nios2_be" >/dev/null 2>&1; then :
131 libc_cv_nios2_be=yes
132 else
133 libc_cv_nios2_be=no
134diff --git a/sysdeps/nios2/configure.ac b/sysdeps/nios2/configure.ac
135index f05f438..dc86399 100644
136--- a/sysdeps/nios2/configure.ac
137+++ b/sysdeps/nios2/configure.ac
138@@ -4,8 +4,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
139 # Nios II big endian is not yet supported.
140 AC_CACHE_CHECK([for big endian],
141 [libc_cv_nios2_be],
142- [AC_EGREP_CPP(yes,[#ifdef __nios2_big_endian__
143- yes
144+ [AC_EGREP_CPP(is_nios2_be,[#ifdef __nios2_big_endian__
145+ is_nios2_be
146 #endif
147 ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)])
148 if test $libc_cv_nios2_be = yes; then
149diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
150index 83f8b13..2b6cbee 100644
151--- a/sysdeps/unix/sysv/linux/mips/configure
152+++ b/sysdeps/unix/sysv/linux/mips/configure
153@@ -387,11 +387,11 @@ else
154 /* end confdefs.h. */
155 dnl
156 #ifdef __mips_nan2008
157-yes
158+use_mips_nan2008
159 #endif
160 _ACEOF
161 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
162- $EGREP "yes" >/dev/null 2>&1; then :
163+ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then :
164 libc_cv_mips_nan2008=yes
165 else
166 libc_cv_mips_nan2008=no
167diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac
168index 5039ec9..1035f76 100644
169--- a/sysdeps/unix/sysv/linux/mips/configure.ac
170+++ b/sysdeps/unix/sysv/linux/mips/configure.ac
171@@ -98,9 +98,9 @@ AC_COMPILE_IFELSE(
172 LIBC_CONFIG_VAR([mips-mode-switch],[${libc_mips_mode_switch}])
173
174 AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding],
175- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl
176+ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl
177 #ifdef __mips_nan2008
178-yes
179+use_mips_nan2008
180 #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)])
181
182 libc_mips_nan=
183diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
184index 70bb18a..ffd9e3e 100644
185--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
186+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
187@@ -155,12 +155,12 @@ else
188 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
189 /* end confdefs.h. */
190 #if _CALL_ELF == 2
191- yes
192+ use_ppc_elfv2_abi
193 #endif
194
195 _ACEOF
196 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
197- $EGREP "yes" >/dev/null 2>&1; then :
198+ $EGREP "use_ppc_elfv2_abi" >/dev/null 2>&1; then :
199 libc_cv_ppc64_elfv2_abi=yes
200 else
201 libc_cv_ppc64_elfv2_abi=no
202@@ -188,12 +188,12 @@ else
203 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
204 /* end confdefs.h. */
205 #ifdef _CALL_ELF
206- yes
207+ is_def_call_elf
208 #endif
209
210 _ACEOF
211 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
212- $EGREP "yes" >/dev/null 2>&1; then :
213+ $EGREP "is_def_call_elf" >/dev/null 2>&1; then :
214 libc_cv_ppc64_def_call_elf=yes
215 else
216 libc_cv_ppc64_def_call_elf=no
217diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
218index 0822915..9a32fdd 100644
219--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
220+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac
221@@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64])
222 # Define default-abi according to compiler flags.
223 AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI],
224 [libc_cv_ppc64_elfv2_abi],
225- [AC_EGREP_CPP(yes,[#if _CALL_ELF == 2
226- yes
227+ [AC_EGREP_CPP(use_ppc_elfv2_abi,[#if _CALL_ELF == 2
228+ use_ppc_elfv2_abi
229 #endif
230 ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)])
231 if test $libc_cv_ppc64_elfv2_abi = yes; then
232@@ -19,8 +19,8 @@ else
233 # Compiler that do not support ELFv2 ABI does not define _CALL_ELF
234 AC_CACHE_CHECK([whether the compiler defines _CALL_ELF],
235 [libc_cv_ppc64_def_call_elf],
236- [AC_EGREP_CPP(yes,[#ifdef _CALL_ELF
237- yes
238+ [AC_EGREP_CPP(is_def_call_elf,[#ifdef _CALL_ELF
239+ is_def_call_elf
240 #endif
241 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])
242 if test $libc_cv_ppc64_def_call_elf = no; then
243--
2441.8.4.5
245
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index 693d937345..91feff58ce 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} \
24 file://fix_am_rootsbindir.patch \ 24 file://fix_am_rootsbindir.patch \
25 file://0001-Add-unused-attribute.patch \ 25 file://0001-Add-unused-attribute.patch \
26 file://0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch \ 26 file://0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch \
27 file://0001-yes-within-the-path-sets-wrong-config-variables.patch \
27 ${EGLIBCPATCHES} \ 28 ${EGLIBCPATCHES} \
28 " 29 "
29EGLIBCPATCHES = "\ 30EGLIBCPATCHES = "\
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-28 17:32:11 +0000