From: Jeremy Puhlman Date: Fri, 3 Apr 2020 21:25:55 +0000 (-0700) Subject: nativesdk-binutils: correct path to ld.so.conf X-Git-Tag: 2020-04-dunfell~25 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d085da8300abb72e14957ecedf40189b25088d4b;p=openembedded-core.git 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 /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] Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie --- 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 info.path = NULL; info.len = info.alloc = 0; - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/ld.so.conf", (const char *) NULL); if (!ldelf_parse_ld_so_conf (&info, tmppath)) {