diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-23 17:55:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-14 17:47:40 +0000 |
| commit | 44ce72fd4b1650fb3137e4feedab8475ec0edebc (patch) | |
| tree | 549527720d1763fffa9572ca6eeebfc45cf6e719 | |
| parent | df34da3e2ffe754d621065d79cf21c2b832f7892 (diff) | |
| download | poky-44ce72fd4b1650fb3137e4feedab8475ec0edebc.tar.gz | |
binutils: Fix nativesdk ld.so search
Currently binutils in buildtools is searching for /etc/etc/ld.so.conf
which makes no sense. ld_sysconfdir already contains /etc so we need to
drop the /etc from the fixed string.
(From OE-Core rev: 54ff75f4dafa733bdb777a037c12000d09559d9c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ccd28c418ab8390118d738fbe914395b5c2a1f75)
Signed-off-by: Steve Sakoman <steve@sakoman.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 4fe5520010..9c825df5ab 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 bfa0d54753a..0d61a3209ec 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 | { |