diff options
author | Jory Pratt <anarchy@gentoo.org> | 2012-05-07 17:46:22 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2012-05-07 17:46:22 +0000 |
commit | e1fc452a13aa766911455045142203b6d8370676 (patch) | |
tree | 76f0da2b32c63be6f0bdd3e645a42ef560f317aa /dev-libs | |
parent | Version bump (diff) | |
download | gentoo-2-e1fc452a13aa766911455045142203b6d8370676.tar.gz gentoo-2-e1fc452a13aa766911455045142203b6d8370676.tar.bz2 gentoo-2-e1fc452a13aa766911455045142203b6d8370676.zip |
Fix cross compilation bug #414099
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/nspr/ChangeLog | 5 | ||||
-rw-r--r-- | dev-libs/nspr/nspr-4.9.ebuild | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 655aed6a28ee..986c26591bd6 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.181 2012/04/26 17:58:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.182 2012/05/07 17:46:22 anarchy Exp $ + + 07 May 2012; Jory A. Pratt <anarchy@gentoo.org> nspr-4.9.ebuild: + Fix cross compilation bug #414099 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> nspr-4.9.ebuild: keyword ~amd64-fbsd diff --git a/dev-libs/nspr/nspr-4.9.ebuild b/dev-libs/nspr/nspr-4.9.ebuild index eb06890bf4c7..a9c0b10046fd 100644 --- a/dev-libs/nspr/nspr-4.9.ebuild +++ b/dev-libs/nspr/nspr-4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.5 2012/04/26 17:58:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.6 2012/05/07 17:46:22 anarchy Exp $ EAPI=3 WANT_AUTOCONF="2.1" @@ -66,6 +66,13 @@ src_configure() { src_compile() { cd "${S}"/build + if tc-is-cross-compiler; then + emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ + -C config nsinstall || die "failed to build" + mv config/{,native-}nsinstall + sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk + rm config/nsinstall.o + fi emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" } |