diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2010-02-13 18:44:40 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-02-13 18:44:40 +0000 |
commit | 01919f043a5fb02e6d83e81e4fc629b8eba1a621 (patch) | |
tree | 874c3e7e1b4049d28b71ea82ce0e62acc8b5ec9b /sys-fs/mtd-utils | |
parent | Add ~alpha/~ia64 wrt #300068 (diff) | |
download | gentoo-2-01919f043a5fb02e6d83e81e4fc629b8eba1a621.tar.gz gentoo-2-01919f043a5fb02e6d83e81e4fc629b8eba1a621.tar.bz2 gentoo-2-01919f043a5fb02e6d83e81e4fc629b8eba1a621.zip |
Bug #276374 again, trying for a different workaround.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/mtd-utils')
-rw-r--r-- | sys-fs/mtd-utils/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/mtd-utils/mtd-utils-20090630.ebuild | 16 |
2 files changed, 17 insertions, 7 deletions
diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog index 8eb837646d62..7576f5e56e97 100644 --- a/sys-fs/mtd-utils/ChangeLog +++ b/sys-fs/mtd-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/mtd-utils -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.27 2009/12/29 06:24:26 vapier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.28 2010/02/13 18:44:40 robbat2 Exp $ + + 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> + mtd-utils-20090630.ebuild: + Bug #276374 again, trying for a different workaround. 29 Dec 2009; Mike Frysinger <vapier@gentoo.org> mtd-utils-20080907.ebuild: Add -j1 for #276374 and fix more ranlib issues #295932. diff --git a/sys-fs/mtd-utils/mtd-utils-20090630.ebuild b/sys-fs/mtd-utils/mtd-utils-20090630.ebuild index a73ce63c21b2..5b639941c481 100644 --- a/sys-fs/mtd-utils/mtd-utils-20090630.ebuild +++ b/sys-fs/mtd-utils/mtd-utils-20090630.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20090630.ebuild,v 1.4 2009/12/29 06:23:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20090630.ebuild,v 1.5 2010/02/13 18:44:40 robbat2 Exp $ inherit eutils @@ -34,13 +34,19 @@ src_unpack() { } makeopts() { - echo CROSS=${CHOST}- + # bug 276374 has an interaction that makes the directories not work quite + # right sometimes. This needs more work. + [[ "${CTARGET}" != "" && "${CHOST}" != "${CTARGET}" ]] && echo CROSS=${CHOST}- use xattr || echo WITHOUT_XATTR=1 } src_compile() { - # bug #276374 - emake -j1 $(makeopts) || die + # bug 276374 requires that the contents of ubi-utils gets built BEFORE the + # rest of the codebase. There is a parallel interference in the Makefile. + pushd ubi-utils + emake $(makeopts) || die + popd + emake $(makeopts) || die } src_install() { |