diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-14 10:19:37 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-14 10:19:37 +0000 |
| commit | 7bf5d9e2157327d532432b98b39ad42708fa4815 (patch) | |
| tree | 5cdc623de0dd7d4ce2862dc6ab510088d754881f /gnome-base | |
| parent | Fixed dependency bug #362797. (diff) | |
| download | gentoo-2-7bf5d9e2157327d532432b98b39ad42708fa4815.tar.gz gentoo-2-7bf5d9e2157327d532432b98b39ad42708fa4815.tar.bz2 gentoo-2-7bf5d9e2157327d532432b98b39ad42708fa4815.zip | |
QA: fix cross-compile workaround. When moving to EAPI=2, cross-compilation was broken as G2CONF is set too late.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/orbit/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/orbit/orbit-2.14.19-r1.ebuild | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog index 59b4bb5e3eeb..b71e86d030f2 100644 --- a/gnome-base/orbit/ChangeLog +++ b/gnome-base/orbit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/orbit # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.173 2011/03/22 19:21:03 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.174 2011/04/14 10:19:37 flameeyes Exp $ + + 14 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> + orbit-2.14.19-r1.ebuild: + QA: fix cross-compile workaround. When moving to EAPI=2, cross-compilation + was broken as G2CONF is set too late. 22 Mar 2011; Brent Baude <ranger@gentoo.org> orbit-2.14.19.ebuild: Marking orbit-2.14.19 ppc stable for bug 353436 diff --git a/gnome-base/orbit/orbit-2.14.19-r1.ebuild b/gnome-base/orbit/orbit-2.14.19-r1.ebuild index 1197fb54e559..b3212d775a74 100644 --- a/gnome-base/orbit/orbit-2.14.19-r1.ebuild +++ b/gnome-base/orbit/orbit-2.14.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.1 2011/03/12 18:59:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.2 2011/04/14 10:19:37 flameeyes Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -57,7 +57,7 @@ src_prepare() { eautoreconf } -src_compile() { +src_configure() { # We need to unset IDL_DIR, which is set by RSI's IDL. This causes certain # files to be not found by autotools when compiling ORBit. See bug #58540 # for more information. Please don't remove -- 8/18/06 @@ -69,7 +69,10 @@ src_compile() { [ -x /usr/bin/orbit-idl-2 ] || die "Please emerge ~${CATEGORY}/${P} on the host system first" G2CONF="${G2CONF} --with-idl-compiler=/usr/bin/orbit-idl-2" fi + gnome2_src_configure +} +src_compile() { # Parallel build fails from time to time, bug #273031 MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile |