summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2021-08-25 22:03:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-23 23:14:17 +0100
commit54053aa4722f2f35fdb4a8a0ee6028af36a65f16 (patch)
treea8e37f82b823423f3dc3f5f710b773932f847af5 /meta
parent304b63767059ed7b11b9b51492b28b96d83f7c04 (diff)
downloadpoky-54053aa4722f2f35fdb4a8a0ee6028af36a65f16.tar.gz
nativesdk-pseudo: Fix to work with glibc 2.34 systems
Since commit [df313aa810 pseudo: Fix to work with glibc 2.34 systems] applied, it fixed native only. And nativesdk has the similar issue Tweak library search order, make prebuilt lib ahead of recipe lib, after apply the fix: ... $ readelf -a lib/pseudo/lib64/libpseudo.so | grep 'Shared library' 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library:[libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] ... (From OE-Core rev: b7d269c84838f646b2915e7ff66d81db0bc16b9e) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d6d116b5db78645958ea30be3d0572e0f6d7bd92) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch38
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb3
2 files changed, 26 insertions, 15 deletions
diff --git a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
index 1552c69b52..c453b5f735 100644
--- a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
+++ b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
@@ -12,26 +12,31 @@ Yes this is horrible. Better solutions welcome.
12 12
13There is more info in the bug: [YOCTO #14521] 13There is more info in the bug: [YOCTO #14521]
14 14
15Upstream-Status: Inappropriate [this patch is native only] 15Upstream-Status: Inappropriate [this patch is native and nativesdk]
16Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 16Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
17 17
18Index: git/Makefile.in 18Tweak library search order, make prebuilt lib ahead of recipe lib
19=================================================================== 19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
20--- git.orig/Makefile.in 20---
21+++ git/Makefile.in 21 Makefile.in | 2 +-
22@@ -122,7 +122,7 @@ libpseudo: $(LIBPSEUDO) 22 pseudo_wrappers.c | 5 ++++-
23 2 files changed, 5 insertions(+), 2 deletions(-)
24
25diff --git a/Makefile.in b/Makefile.in
26--- a/Makefile.in
27+++ b/Makefile.in
28@@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN)
29 libpseudo: $(LIBPSEUDO)
30
23 $(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB) 31 $(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB)
24 $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ 32- $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
33+ $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
25 pseudo_client.o pseudo_ipc.o \ 34 pseudo_client.o pseudo_ipc.o \
26- $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS) 35 $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
27+ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CLIENT_LDFLAGS)
28 36
29 # *everything* now relies on stuff that's generated in the 37diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c
30 # wrapper process. 38--- a/pseudo_wrappers.c
31Index: git/pseudo_wrappers.c 39+++ b/pseudo_wrappers.c
32===================================================================
33--- git.orig/pseudo_wrappers.c
34+++ git/pseudo_wrappers.c
35@@ -100,10 +100,13 @@ static void libpseudo_atfork_child(void) 40@@ -100,10 +100,13 @@ static void libpseudo_atfork_child(void)
36 pseudo_mutex_holder = 0; 41 pseudo_mutex_holder = 0;
37 } 42 }
@@ -47,3 +52,6 @@ Index: git/pseudo_wrappers.c
47 52
48 pseudo_getlock(); 53 pseudo_getlock();
49 pseudo_antimagic(); 54 pseudo_antimagic();
55--
562.27.0
57
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 28e8a1c6be..f36dfa589f 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -8,6 +8,9 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \
8SRC_URI:append:class-native = " \ 8SRC_URI:append:class-native = " \
9 http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \ 9 http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
10 file://older-glibc-symbols.patch" 10 file://older-glibc-symbols.patch"
11SRC_URI:append:class-nativesdk = " \
12 http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
13 file://older-glibc-symbols.patch"
11SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" 14SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
12 15
13SRCREV = "21ff2fb690efbe57e7dd867c39aff36ab72a6ac5" 16SRCREV = "21ff2fb690efbe57e7dd867c39aff36ab72a6ac5"