diff options
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch | 50 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch | 85 |
2 files changed, 0 insertions, 135 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch b/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch deleted file mode 100644 index 8881f6ee86..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo/obey-ldflags.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 0ace81a687355a3c55caa161b51972a82f5c413f Mon Sep 17 00:00:00 2001 | ||
2 | From: Christopher Larson <chris_larson@mentor.com> | ||
3 | Date: Mon, 9 May 2016 17:00:57 -0700 | ||
4 | Subject: [PATCH] Obey external LDFLAGS the way we obey CFLAGS | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
9 | --- | ||
10 | Makefile.in | 8 ++++---- | ||
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/Makefile.in b/Makefile.in | ||
14 | index 6511814..22ef625 100644 | ||
15 | --- a/Makefile.in | ||
16 | +++ b/Makefile.in | ||
17 | @@ -109,26 +109,26 @@ pseudo: $(PSEUDO) | ||
18 | $(PSEUDO): $(BIN) pseudo.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_server.o pseudo_ipc.o | ||
19 | $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDO) \ | ||
20 | pseudo.o pseudo_server.o pseudo_client.o pseudo_ipc.o \ | ||
21 | - $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) | ||
22 | + $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) | ||
23 | |||
24 | pseudolog: $(PSEUDOLOG) | ||
25 | |||
26 | $(PSEUDOLOG): $(BIN) pseudolog.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_ipc.o | ||
27 | $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDOLOG) pseudolog.o pseudo_client.o pseudo_ipc.o \ | ||
28 | - $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) | ||
29 | + $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) | ||
30 | |||
31 | pseudodb: $(PSEUDODB) | ||
32 | |||
33 | $(PSEUDODB): $(BIN) pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | ||
34 | $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDODB) pseudodb.o \ | ||
35 | - $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(DB_LDFLAGS) $(CLIENT_LDFLAGS) | ||
36 | + $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS) | ||
37 | |||
38 | libpseudo: $(LIBPSEUDO) | ||
39 | |||
40 | $(LIBPSEUDO): $(LIB) $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | ||
41 | $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ | ||
42 | pseudo_client.o pseudo_ipc.o \ | ||
43 | - $(WRAPOBJS) $(SHOBJS) $(CLIENT_LDFLAGS) | ||
44 | + $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS) | ||
45 | |||
46 | # *everything* now relies on stuff that's generated in the | ||
47 | # wrapper process. | ||
48 | -- | ||
49 | 2.8.0 | ||
50 | |||
diff --git a/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch b/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch deleted file mode 100644 index 6710734f9c..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | We started seeing: | ||
2 | |||
3 | No real function for mknod: /home/paul/poky_sdk/tmp/sysroots/x86_64- | ||
4 | linux/usr/bin/../lib/pseudo/lib64/libpseudo.so: undefined symbol: mknod | ||
5 | No real function for mknodat: /home/paul/poky_sdk/tmp/sysroots/x86_64- | ||
6 | linux/usr/bin/../lib/pseudo/lib64/libpseudo.so: undefined symbol: mknodat | ||
7 | |||
8 | In glibc 2.24 they've merged: | ||
9 | |||
10 | https://sourceware.org/git/?p=glibc.git;a=commit;h=7d45c163d00c88d5875a112343c4ea3e61349e6b | ||
11 | related to bugzilla entry: | ||
12 | https://sourceware.org/bugzilla/show_bug.cgi?id=19509 | ||
13 | |||
14 | which means that the behaviour of RTLD_NEXT is slightly different. | ||
15 | As far as I can tell, mknod has not been present in glibc for a while. | ||
16 | To quote stat.h: | ||
17 | |||
18 | /* To allow the `struct stat' structure and the file type `mode_t' | ||
19 | bits to vary without changing shared library major version number, | ||
20 | the `stat' family of functions and `mknod' are in fact inline | ||
21 | wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod', | ||
22 | which all take a leading version-number argument designating the | ||
23 | data structure and bits used. <bits/stat.h> defines _STAT_VER with | ||
24 | the version number corresponding to `struct stat' as defined in | ||
25 | that file; and _MKNOD_VER with the version number corresponding to | ||
26 | the S_IF* macros defined therein. It is arranged that when not | ||
27 | inlined these function are always statically linked; that way a | ||
28 | dynamically-linked executable always encodes the version number | ||
29 | corresponding to the data structures it uses, so the `x' functions | ||
30 | in the shared library can adapt without needing to recompile all | ||
31 | callers. */ | ||
32 | |||
33 | so I suspect mknod has not existed for a while, if ever and what we | ||
34 | were finding, who knows. Everying in the system links against _xmknod | ||
35 | which we have a separate wrapper for. | ||
36 | |||
37 | Anyhow, ignoring that problem which hasn't caused a issue in the past, | ||
38 | the RTLD_NEXT change causes messages to be printed to stdout which causes | ||
39 | carnage if for example the packaging code is expecting a list of packages: | ||
40 | |||
41 | WARNING: core-image-minimal-1.0-r0 do_rootfs: No not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). | ||
42 | WARNING: core-image-minimal-1.0-r0 do_rootfs: real not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). | ||
43 | WARNING: core-image-minimal-1.0-r0 do_rootfs: function not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). | ||
44 | WARNING: core-image-minimal-1.0-r0 do_rootfs: for not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). | ||
45 | WARNING: core-image-minimal-1.0-r0 do_rootfs: mknod: not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all). | ||
46 | [etc] | ||
47 | |||
48 | This bug will affect: | ||
49 | * any distro using glibc 2.24 | ||
50 | * any system using a uninative tarball for glibc 2.24 | ||
51 | * any system which took a backport for the fix which was merged into | ||
52 | the 2.23 branch for a while before it was reverted (Fedora 23 had this) | ||
53 | |||
54 | The easiest thing to do is to ignore the problem and disable the diag | ||
55 | message which masks the problem with no ill effects. | ||
56 | |||
57 | As Peter notes, there are a few issues here: | ||
58 | |||
59 | * the fact there is no mknod symbol | ||
60 | * the fact an error here isn't fatal | ||
61 | * the #ifdef/#else looks suspect | ||
62 | * handle RTLD_NEXT chaining properly (need more libs?) | ||
63 | |||
64 | which he'll work on upstream and hopefully have fixed in a new version. | ||
65 | |||
66 | Upstream-Status: Submitted [Peter is aware of the issue] | ||
67 | |||
68 | RP 2016/5/18 | ||
69 | |||
70 | Index: pseudo-1.7.5/pseudo_wrappers.c | ||
71 | =================================================================== | ||
72 | --- pseudo-1.7.5.orig/pseudo_wrappers.c | ||
73 | +++ pseudo-1.7.5/pseudo_wrappers.c | ||
74 | @@ -146,9 +146,9 @@ pseudo_init_one_wrapper(pseudo_function | ||
75 | return; | ||
76 | } | ||
77 | #else | ||
78 | - if (e != NULL) { | ||
79 | + /*if (e != NULL) { | ||
80 | pseudo_diag("No real function for %s: %s\n", func->name, e); | ||
81 | - } | ||
82 | + }*/ | ||
83 | #endif | ||
84 | } | ||
85 | } | ||