summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-06-14 09:32:52 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-06-14 11:33:08 +0100
commit215bc6822cfb1a61f51bed22ef59d33fb4f822bf (patch)
tree8ebfa54e55370454d83e73c3acc55aecb6c567d4 /eclass
parenttoolchain-funcs.eclass: export tc-get*STRINGS helpers (diff)
downloadgentoo-215bc6822cfb1a61f51bed22ef59d33fb4f822bf.tar.gz
gentoo-215bc6822cfb1a61f51bed22ef59d33fb4f822bf.tar.bz2
gentoo-215bc6822cfb1a61f51bed22ef59d33fb4f822bf.zip
multilib.eclass: populate STRINGS
For both multilib and non-multilib profiles binutils provides tools with native CHOST prefix only. For example on amd64 there is only 'x86_64-pc-linux-gnu-strings' and 'strings'. autoconf usually uses AC_CHECK_TOOL(STRINGS, strings) autodetection to discover either of these. The change overrides STRINGS and friends to 'x86_64-pc-linux-gnu-strings' for multilib setup similar to other environment variables. Tested on media-libs/x264 and x11-libs/cairo packages. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/multilib.eclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 54ff1509ead..342d21a2e1c 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -470,6 +470,7 @@ multilib_toolchain_setup() {
PKG_CONFIG
RANLIB
READELF
+ STRINGS
STRIP
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
@@ -504,6 +505,7 @@ multilib_toolchain_setup() {
#
# Make sure ${save_restore_variables[@]} list matches below.
export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
+
export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar'
export CC="$(tc-getCC) $(get_abi_CFLAGS)"
export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
@@ -515,7 +517,9 @@ multilib_toolchain_setup() {
export PKG_CONFIG="$(tc-getPKG_CONFIG)"
export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use '${CHOST}-ranlib'
export READELF="$(tc-getREADELF)" # Avoid 'readelf', use '${CHOST}-readelf'
+ export STRINGS="$(tc-getSTRINGS)" # Avoid 'strings', use '${CHOST}-strings'
export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip'
+
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig