From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib.eclass
Date: Mon, 21 Jan 2013 19:22:25 +0000 (UTC) [thread overview]
Message-ID: <20130121192225.BFD782171D@flycatcher.gentoo.org> (raw)
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 <mgorny@gentoo.org> multilib.eclass:
+ Set PKG_CONFIG_{LIBDIR,PATH} for multilib builds. Approved by vapier in bug
+ #453206.
20 Jan 2013; Michał Górny <mgorny@gentoo.org> 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
}
next reply other threads:[~2013-01-21 19:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 19:22 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-26 14:25 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib.eclass Christoph Junghans (ottxor)
2011-12-14 18:15 Sergei Trofimovich (slyfox)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130121192225.BFD782171D@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox