diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2007-11-30 21:49:34 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2007-11-30 21:49:34 +0000 |
| commit | 8c533e41433059deb4bd7defd7be32dbbb1681ce (patch) | |
| tree | 7b3bd5c9cc696c1e4b83746cd2e4681c118b3e7d /sys-apps | |
| parent | Change i18n installation directory. (diff) | |
| download | gentoo-2-8c533e41433059deb4bd7defd7be32dbbb1681ce.tar.gz gentoo-2-8c533e41433059deb4bd7defd7be32dbbb1681ce.tar.bz2 gentoo-2-8c533e41433059deb4bd7defd7be32dbbb1681ce.zip | |
Fix cross compile, bug#200367, thanks to Joakim Tjernlund
(Portage version: 2.1.4_rc4)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.8.2.ebuild | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index fdc271f27781..4c08bc3b4b3e 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.164 2007/11/28 21:34:01 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.165 2007/11/30 21:49:34 alonbl Exp $ + + 30 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> busybox-1.8.2.ebuild: + Fix cross compile, bug#200367, thanks to Joakim Tjernlund *busybox-1.8.2 (28 Nov 2007) diff --git a/sys-apps/busybox/busybox-1.8.2.ebuild b/sys-apps/busybox/busybox-1.8.2.ebuild index c8c86c1eb674..9320fd865857 100644 --- a/sys-apps/busybox/busybox-1.8.2.ebuild +++ b/sys-apps/busybox/busybox-1.8.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.1 2007/11/28 21:34:01 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.2 2007/11/30 21:49:34 alonbl Exp $ -inherit eutils flag-o-matic savedconfig +inherit eutils flag-o-matic savedconfig toolchain-funcs ################################################################################ # BUSYBOX ALTERNATE CONFIG MINI-HOWTO @@ -88,6 +88,9 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/busybox-1.7.0-bb.patch + # set build environment + MAKE_CONFIG="CROSS_COMPILE=${CHOST}- ARCH=$(tc-arch-kernel) HOSTCC=${CBUILD}-gcc" + # work around broken ass powerpc compilers use ppc64 && append-flags -mminimal-toc if ! use uclibc; then @@ -95,10 +98,8 @@ src_unpack() { sed -i 's:-Wl,--gc-sections::' scripts/trylink sed -i '/^#error Aborting compilation./d' applets/applets.c fi - echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.local # check for a busybox config before making one of our own. - # if one exist lets return and use it. restore_config .config if [ -f .config ]; then @@ -151,10 +152,10 @@ src_unpack() { src_compile() { unset KBUILD_OUTPUT #88088 - emake busybox || die "build failed" + emake busybox ${MAKE_CONFIG} || die "build failed" if ! use static && ! use pam ; then mv busybox_unstripped{,.bak} - emake CONFIG_STATIC=y busybox || die "static build failed" + emake busybox CONFIG_STATIC=y ${MAKE_CONFIG} || die "static build failed" mv busybox_unstripped bb mv busybox_unstripped{.bak,} fi @@ -177,7 +178,7 @@ src_install() { doins "${FILESDIR}"/mdev-start.sh || die # bundle up the symlink files for use later - emake install || die + emake install ${MAKE_CONFIG} || die rm _install/bin/busybox tar cf busybox-links.tar -C _install . || : #;die insinto /usr/share/${PN} |