From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 15E7B1385CF for ; Mon, 21 Jan 2013 19:22:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CF69E065A; Mon, 21 Jan 2013 19:22:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B130E065A for ; Mon, 21 Jan 2013 19:22:28 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05F4D33DA96 for ; Mon, 21 Jan 2013 19:22:27 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id BFD782171D; Mon, 21 Jan 2013 19:22:25 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog multilib.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130121192225.BFD782171D@flycatcher.gentoo.org> Date: Mon, 21 Jan 2013 19:22:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 10a1b61b-8138-4127-9c8f-726fbcb11277 X-Archives-Hash: a13014331e76b7fdbfa08f000a6493ef mgorny 13/01/21 19:22:25 Modified: ChangeLog multilib.eclass Log: Set PKG_CONFIG_{LIBDIR,PATH} for multilib builds. Approved by vapier in bug #453206. Revision Changes Path 1.630 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.630&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.630&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.629&r2=1.630 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.629 retrieving revision 1.630 diff -u -r1.629 -r1.630 --- ChangeLog 20 Jan 2013 23:42:48 -0000 1.629 +++ ChangeLog 21 Jan 2013 19:22:25 -0000 1.630 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.629 2013/01/20 23:42:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.630 2013/01/21 19:22:25 mgorny Exp $ + + 21 Jan 2013; Michał Górny multilib.eclass: + Set PKG_CONFIG_{LIBDIR,PATH} for multilib builds. Approved by vapier in bug + #453206. 20 Jan 2013; Michał Górny autotools-multilib.eclass: Enable EAPI=5. 1.102 eclass/multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.102&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.102&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.101&r2=1.102 Index: multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- multilib.eclass 17 Oct 2012 19:13:18 -0000 1.101 +++ multilib.eclass 21 Jan 2013 19:22:25 -0000 1.102 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.101 2012/10/17 19:13:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.102 2013/01/21 19:22:25 mgorny Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -395,7 +395,7 @@ # 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 @@ # 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 @@ 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 }