summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2009-03-17 15:17:37 +0000
committerMart Raudsepp <leio@gentoo.org>2009-03-17 15:17:37 +0000
commit4153bbcc284b8999b4fcb23edc8e8f7a510dc3c3 (patch)
tree941afc80b2b77baa92d2b89800e42b2b50607fb8 /gnome-base/orbit
parentFix for manifest failure. Bug 262801. (diff)
downloadgentoo-2-4153bbcc284b8999b4fcb23edc8e8f7a510dc3c3.tar.gz
gentoo-2-4153bbcc284b8999b4fcb23edc8e8f7a510dc3c3.tar.bz2
gentoo-2-4153bbcc284b8999b4fcb23edc8e8f7a510dc3c3.zip
Fix cross-compilation, bug 262741. Thanks to Maksim Melnikau.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/orbit')
-rw-r--r--gnome-base/orbit/ChangeLog5
-rw-r--r--gnome-base/orbit/orbit-2.14.17.ebuild11
2 files changed, 13 insertions, 3 deletions
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index d441ffec909e..0f4bd1fa3ab9 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-base/orbit
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.147 2009/03/08 00:59:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.148 2009/03/17 15:17:37 leio Exp $
+
+ 17 Mar 2009; Mart Raudsepp <leio@gentoo.org> orbit-2.14.17.ebuild:
+ Fix cross-compilation, bug 262741. Thanks to Maksim Melnikau.
*orbit-2.14.17 (08 Mar 2009)
diff --git a/gnome-base/orbit/orbit-2.14.17.ebuild b/gnome-base/orbit/orbit-2.14.17.ebuild
index c6a32325d7b4..676d5f91d5c6 100644
--- a/gnome-base/orbit/orbit-2.14.17.ebuild
+++ b/gnome-base/orbit/orbit-2.14.17.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.17.ebuild,v 1.1 2009/03/08 00:59:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.17.ebuild,v 1.2 2009/03/17 15:17:37 leio Exp $
GCONF_DEBUG="no"
-inherit gnome2
+inherit gnome2 toolchain-funcs
MY_P="ORBit2-${PV}"
PVP=(${PV//[-\._]/ })
@@ -34,6 +34,13 @@ src_compile() {
# for more information. Please don't remove -- 8/18/06
unset IDL_DIR
+ # We need to use the hosts IDL compiler if cross-compiling, bug #262741
+ if tc-is-cross-compiler; then
+ # check that host version is present and executable
+ [ -x /usr/bin/orbit-idl-2 ] || die "Please emerge =gnome-base/orbit-${P} on the host system first"
+ G2CONF="${G2CONF} --with-idl-compiler=/usr/bin/orbit-idl-2"
+ fi
+
gnome2_src_compile
}