1 |
For both multilib and non-multilib profiles binutils provides |
2 |
tools with native CHOST prefix only. For example on amd64 there |
3 |
is only 'x86_64-pc-linux-gnu-readelf' and 'readelf'. |
4 |
|
5 |
meson build system uses 'readelf' or $READELF binaries |
6 |
and relies on meson.eclass to populate READELF. |
7 |
|
8 |
The change overrides READELF and friends to 'x86_64-pc-linux-gnu-readelf' |
9 |
for multilib setup similar to other environment variables. |
10 |
|
11 |
Tested on net-libs/gssdp package. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/725304 |
14 |
Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
15 |
--- |
16 |
eclass/multilib.eclass | 2 ++ |
17 |
1 file changed, 2 insertions(+) |
18 |
|
19 |
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass |
20 |
index b79718bb193..ed54568aa2d 100644 |
21 |
--- a/eclass/multilib.eclass |
22 |
+++ b/eclass/multilib.eclass |
23 |
@@ -468,6 +468,7 @@ multilib_toolchain_setup() { |
24 |
NM |
25 |
OBJDUMP |
26 |
RANLIB |
27 |
+ READELF |
28 |
STRIP |
29 |
PKG_CONFIG_LIBDIR |
30 |
PKG_CONFIG_PATH |
31 |
@@ -510,6 +511,7 @@ multilib_toolchain_setup() { |
32 |
export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm' |
33 |
export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use '${CHOST}-objdump' |
34 |
export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use '${CHOST}-ranlib' |
35 |
+ export READELF="$(tc-getREADELF)" # Avoid 'readelf', use '${CHOST}-readelf' |
36 |
export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip' |
37 |
export CHOST=$(get_abi_CHOST $1) |
38 |
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig |
39 |
-- |
40 |
2.26.2 |