summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-26 11:22:37 -0500
committerSteve Sakoman <steve@sakoman.com>2024-08-06 19:11:18 -0700
commitf2e9c85eca41b44b869da8e64a2defe43b9698d0 (patch)
treea4edb353ac0e9bb5465e6094642ea3f096d3dc93
parentd6771999e0a786101b3f673e2ccc0e56e5cb6bdc (diff)
downloadpoky-f2e9c85eca41b44b869da8e64a2defe43b9698d0.tar.gz
pseudo: Fix to work with glibc 2.40
glibc 2.40 renames some internal header variables. Update our hack to work with the new version. These kinds of problems illustrate we need to address the issue properly. (From OE-Core rev: 1d5903bf749436d9b26df858041337b723614963) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 35021d650de3eecc3f42000181b39a5db5a8eaa0) Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-devtools/pseudo/files/glibc238.patch10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-devtools/pseudo/files/glibc238.patch b/meta/recipes-devtools/pseudo/files/glibc238.patch
index da4b8caee3..dfb5c283f6 100644
--- a/meta/recipes-devtools/pseudo/files/glibc238.patch
+++ b/meta/recipes-devtools/pseudo/files/glibc238.patch
@@ -9,7 +9,7 @@ Index: git/pseudo_wrappers.c
9=================================================================== 9===================================================================
10--- git.orig/pseudo_wrappers.c 10--- git.orig/pseudo_wrappers.c
11+++ git/pseudo_wrappers.c 11+++ git/pseudo_wrappers.c
12@@ -6,6 +6,15 @@ 12@@ -6,6 +6,18 @@
13 * SPDX-License-Identifier: LGPL-2.1-only 13 * SPDX-License-Identifier: LGPL-2.1-only
14 * 14 *
15 */ 15 */
@@ -21,6 +21,9 @@ Index: git/pseudo_wrappers.c
21+#undef __GLIBC_USE_ISOC2X 21+#undef __GLIBC_USE_ISOC2X
22+#undef __GLIBC_USE_C2X_STRTOL 22+#undef __GLIBC_USE_C2X_STRTOL
23+#define __GLIBC_USE_C2X_STRTOL 0 23+#define __GLIBC_USE_C2X_STRTOL 0
24+#undef __GLIBC_USE_ISOC23
25+#undef __GLIBC_USE_C23_STRTOL
26+#define __GLIBC_USE_C23_STRTOL 0
24+ 27+
25 #include <assert.h> 28 #include <assert.h>
26 #include <stdlib.h> 29 #include <stdlib.h>
@@ -29,7 +32,7 @@ Index: git/pseudo_util.c
29=================================================================== 32===================================================================
30--- git.orig/pseudo_util.c 33--- git.orig/pseudo_util.c
31+++ git/pseudo_util.c 34+++ git/pseudo_util.c
32@@ -8,6 +8,14 @@ 35@@ -8,6 +8,17 @@
33 */ 36 */
34 /* we need access to RTLD_NEXT for a horrible workaround */ 37 /* we need access to RTLD_NEXT for a horrible workaround */
35 #define _GNU_SOURCE 38 #define _GNU_SOURCE
@@ -41,6 +44,9 @@ Index: git/pseudo_util.c
41+#undef __GLIBC_USE_ISOC2X 44+#undef __GLIBC_USE_ISOC2X
42+#undef __GLIBC_USE_C2X_STRTOL 45+#undef __GLIBC_USE_C2X_STRTOL
43+#define __GLIBC_USE_C2X_STRTOL 0 46+#define __GLIBC_USE_C2X_STRTOL 0
47+#undef __GLIBC_USE_ISOC23
48+#undef __GLIBC_USE_C23_STRTOL
49+#define __GLIBC_USE_C23_STRTOL 0
44 50
45 #include <ctype.h> 51 #include <ctype.h>
46 #include <errno.h> 52 #include <errno.h>