eclass/multilib: sync with upstream and drop PKG_CONFIG magic (which upstream now handles better)

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

1 files changed, 4 insertions, 27 deletions

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 515bc08..b711bcc 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -327,8 +327,8 @@ multilib_env() {
 			# Not possible to do multilib with aarch64 and a single toolchain.
 			export CFLAGS_arm=${CFLAGS_arm-}
 			case ${cpu} in
-				aarch64*be) export CHOST_arm="armv8b-${CTARGET#*-}";;
-				*)          export CHOST_arm="armv8l-${CTARGET#*-}";;
+			aarch64*be) export CHOST_arm="armv8b-${CTARGET#*-}";;
+			*)          export CHOST_arm="armv8l-${CTARGET#*-}";;
 			esac
 			CHOST_arm=${CHOST_arm/%-gnu/-gnueabi}
 			export CTARGET_arm=${CHOST_arm}
@@ -455,7 +455,7 @@ multilib_toolchain_setup() {
 
 	# First restore any saved state we have laying around.
 	if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then
-		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG{_LIBDIR,_PATH,} ; do
+		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			vv="__abi_saved_${v}"
 			[[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v}
 			unset ${vv}
@@ -467,7 +467,7 @@ multilib_toolchain_setup() {
 	# screws up ccache and distcc.  See #196243 for more info.
 	if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
 		# Back that multilib-ass up so we can restore it later
-		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG{_LIBDIR,_PATH,} ; do
+		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			vv="__abi_saved_${v}"
 			[[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv}
 		done
@@ -479,33 +479,10 @@ multilib_toolchain_setup() {
 		export CC="$(tc-getCC) $(get_abi_CFLAGS)"
 		export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
 		export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
-
 		export CHOST=$(get_abi_CHOST $1)
-
 		export CBUILD=$(get_abi_CHOST $1)
 		export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
 		export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
-
-		# I find this pretty confusing.  I don't think we want to let tc-getPKG_CONFIG
-		# look up our pkg-config for us once we change CHOST -- that is now going to
-		# pick up the <abi-tuple>-pkg-config executable which could come from crossdev
-		# or god-knows where...  unless we are doing a compile for crossdev, we want
-		# to treat all multi-abi pkg-configs the same, /except/ for the two variables
-		# above.
-		#
-		# pkg-config is a text-file processor, after all, like "sed".  Who cares if we
-		# run our own so long as we give it the right environment variables?
-		#
-		# Not sure I'm happy with any of these solutions or the one below.  If anyone
-		# has a crystal-clear idea of the full semantic import of this... drop me a line!
-		#
-		# -gmt Nov. 2013
-		#
-		if ! tc-is-cross-compiler ; then
-			export PKG_CONFIG=$( tc-getPKG_CONFIG $(get_abi_CHOST ${DEFAULT_ABI}) )
-		else
-			export PKG_CONFIG=$( tc-getPKG_CONFIG $(get_abi_CHOST $1) )
-		fi
 	fi
 }