[patch] Fixed style

0001-Export-proper-PKG_CONFIG_-LIBDIR-PATH-for-multilib-b.patch (text/plain), 1.62 KB, created by Michał Górny on 2013-01-21 08:34:28 UTC

From 8c194c6793945860c60a923338ce1fc4988e5b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[e-mail]>
Date: Sun, 20 Jan 2013 19:06:50 +0100
Subject: [PATCH 1/7] Export proper PKG_CONFIG_{LIBDIR,PATH} for multilib
 builds.

Theoretically, PKG_CONFIG_PATH is enough. However, not setting libdir
results in undesired lib64 fallback.
---
 eclass/multilib.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 65b9ca6..d7f3da1 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -395,7 +395,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 ; do
+		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			vv="__abi_saved_${v}"
 			export ${v}="${!vv}"
 			unset ${vv}
@@ -407,7 +407,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 ; do
+		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			export __abi_saved_${v}="${!v}"
 		done
 		export __DEFAULT_ABI_SAVED="true"
@@ -420,6 +420,8 @@ multilib_toolchain_setup() {
 		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
 	fi
 }
 
-- 
1.8.1.1