diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-12-08 02:36:01 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-08 02:36:01 +0000 |
commit | d80d2cf27abbec3e0e7d00c84c56ab8a0c0d5fd9 (patch) | |
tree | 227687268d74e0911b490a5b501b5d35b96d4ca8 | |
parent | New version 2.8.1 with xpdf security fixes, removed older versions (Manifest ... (diff) | |
download | gentoo-2-d80d2cf27abbec3e0e7d00c84c56ab8a0c0d5fd9.tar.gz gentoo-2-d80d2cf27abbec3e0e7d00c84c56ab8a0c0d5fd9.tar.bz2 gentoo-2-d80d2cf27abbec3e0e7d00c84c56ab8a0c0d5fd9.zip |
cross compile fixes
-rw-r--r-- | sys-apps/debianutils/debianutils-1.16.7-r4.ebuild | 15 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.0.51-r8.ebuild | 5 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild index c74b549ab806..117011c7765c 100644 --- a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild +++ b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.16 2004/11/28 12:47:07 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.17 2004/12/08 02:34:04 vapier Exp $ -inherit eutils +inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="A selection of tools from Debian" HOMEPAGE="http://packages.debian.org/unstable/base/debianutils.html" @@ -14,8 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86" IUSE="static build" DEPEND="virtual/libc" -RDEPEND="app-arch/bzip2 - !ppc-macos? ( sys-apps/coreutils )" +RDEPEND="app-arch/bzip2" src_unpack() { unpack ${A} @@ -35,12 +34,8 @@ src_unpack() { } src_compile() { - if use static - then - emake LDFLAGS=-static || die - else - emake || die - fi + use static && append-ldflags -static + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die } src_install() { diff --git a/sys-apps/portage/portage-2.0.51-r8.ebuild b/sys-apps/portage/portage-2.0.51-r8.ebuild index 196dad3d3618..329820044f40 100644 --- a/sys-apps/portage/portage-2.0.51-r8.ebuild +++ b/sys-apps/portage/portage-2.0.51-r8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r8.ebuild,v 1.2 2004/12/07 06:09:40 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r8.ebuild,v 1.3 2004/12/08 02:36:01 vapier Exp $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils toolchain-funcs # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can # cause everything to segfault !! @@ -58,6 +58,7 @@ src_unpack() { src_compile() { cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool cd ${S}/src/sandbox-1.1 + export CC="$(tc-getCC)" case ${ARCH} in "x86") make CFLAGS="-march=i386 -O1 -pipe" || die |