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