diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-04-03 14:25:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-05 11:46:38 +0100 |
commit | 8b8d6897542f07cf47a4ee9def6d00d0fece96f1 (patch) | |
tree | 7831c777a038a40bcfd0ac5f9ea6b4e1247f051d | |
parent | af4a96e8b256fb2504589b151ae470ffa4df8ece (diff) | |
download | poky-8b8d6897542f07cf47a4ee9def6d00d0fece96f1.tar.gz |
nativesdk-binutils: correct path to ld.so.conf
The alternative ld.so patch is set up so the linker will search
the nativesdk sysroot before searching the host filesystem.
However the patch concatenates <sysroot>/etc and /etc/ld.so.conf
leading to a path that does not exist:
3061991 openat(AT_FDCWD, "/buildtools/sysroots/x86_64-pokysdk-linux/etc/etc/ld.so.conf",
O_RDONLY) = -1 ENOENT (No such file or directory)
In native-nspr, the build uses -lpthread, which triggers a search for librt, but because
of the above it drags in the system librt leading to errors as follows:
/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/gcc/x86_64-pokysdk-linux/
9.3.0/../../../../x86_64-pokysdk-linux/bin/ld: /lib64/librt.so.1:
undefined reference to `__clock_getcpuclockid@GLIBC_PRIVATE'
update concatenation to correctly construct the path to the nativesdk ld.so.conf
[YOCTO #13853]
(From OE-Core rev: d085da8300abb72e14957ecedf40189b25088d4b)
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 8b59ba5dec..4b4d73d21d 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch | |||
@@ -65,7 +65,7 @@ index 2e27cf48a8..a095d6aac5 100644 | |||
65 | info.path = NULL; | 65 | info.path = NULL; |
66 | info.len = info.alloc = 0; | 66 | info.len = info.alloc = 0; |
67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", | 67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", |
68 | + tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", | 68 | + tmppath = concat (ld_sysconfdir, "/ld.so.conf", |
69 | (const char *) NULL); | 69 | (const char *) NULL); |
70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) | 70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) |
71 | { | 71 | { |