diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-06-09 04:23:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-06-09 04:23:36 +0000 |
| commit | 448d0d8e4a4150bdad640b6f5f9df7e35fe186be (patch) | |
| tree | be3d0b8be9360405e8854d0ecafd55ab540856f9 /sys-apps/busybox | |
| parent | adding gcc-4.0.1_rc1 snapshot (diff) | |
| download | gentoo-2-448d0d8e4a4150bdad640b6f5f9df7e35fe186be.tar.gz gentoo-2-448d0d8e4a4150bdad640b6f5f9df7e35fe186be.tar.bz2 gentoo-2-448d0d8e4a4150bdad640b6f5f9df7e35fe186be.zip | |
make sure we reset the env in every func
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/busybox-1.00-r4.ebuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys-apps/busybox/busybox-1.00-r4.ebuild b/sys-apps/busybox/busybox-1.00-r4.ebuild index fcd97c368000..baf49b3543e5 100644 --- a/sys-apps/busybox/busybox-1.00-r4.ebuild +++ b/sys-apps/busybox/busybox-1.00-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.11 2005/06/05 07:50:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.12 2005/06/09 04:23:36 vapier Exp $ inherit eutils @@ -30,6 +30,12 @@ S=${WORKDIR}/${MY_P} # <pebenito> then eventually turning on selinux would mean # adding a dep: selinux? ( sys-libs/libselinux ) +busybox_set_env() { + type -p ${CHOST}-ar && export CROSS=${CHOST}- + # Don't let KBUILD_OUTPUT mess us up #88088 + unset KBUILD_OUTPUT +} + busybox_config_option() { case $1 in y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;; @@ -63,9 +69,6 @@ src_unpack() { epatch "${WORKDIR}"/${P}-e2fsprogs.patch epatch "${FILESDIR}"/1.00/gcc4.patch - # Don't let KBUILD_OUTPUT mess us up #88088 - unset KBUILD_OUTPUT - #bunzip #ftp://ftp.simtreas.ru/pub/my/bb/new/find.c.gz @@ -133,13 +136,10 @@ src_unpack() { make oldconfig > /dev/null } -busybox_set_cross_compiler() { - type -p ${CHOST}-ar && export CROSS=${CHOST}- -} - src_compile() { - busybox_set_cross_compiler - #emake -j1 CROSS="${CROSS}" include/config.h busybox || die + busybox_set_env + #emake -j1 CROSS="${CROSS}" depend || die "depend failed" + #emake CROSS="${CROSS}" busybox || die "build failed" emake -j1 CROSS="${CROSS}" busybox || die "build failed" if ! use static ; then mv busybox{,.bak} @@ -164,7 +164,7 @@ src_compile() { } src_install() { - busybox_set_cross_compiler + busybox_set_env into / dobin busybox |