diff options
Diffstat (limited to 'sys-apps/sandbox/sandbox-1.2.9.ebuild')
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.9.ebuild | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/sys-apps/sandbox/sandbox-1.2.9.ebuild b/sys-apps/sandbox/sandbox-1.2.9.ebuild index e370e6bc7822..2977aefae986 100644 --- a/sys-apps/sandbox/sandbox-1.2.9.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.9.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.1 2005/06/09 17:34:43 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $ # # don't monkey with this ebuild unless contacting portage devs. # period. # -inherit eutils flag-o-matic eutils toolchain-funcs multilib +inherit eutils flag-o-matic toolchain-funcs multilib DESCRIPTION="sandbox'd LD_PRELOAD hack" HOMEPAGE="http://www.gentoo.org/" @@ -16,8 +16,9 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -#KEYWORDS=" alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" +#KEYWORDS=" alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="" RESTRICT="multilib-pkg-force" @@ -29,6 +30,8 @@ setup_multilib() { export MULTILIB_ABIS="x86 amd64" export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"} export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"} + export CHOST_amd64="x86_64-pc-linux-gnu" + export CHOST_x86="i686-pc-linux-gnu" export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}} export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}} fi @@ -37,10 +40,13 @@ setup_multilib() { src_unpack() { setup_multilib for ABI in $(get_install_abis) ; do - unpack ${A} cd ${WORKDIR} + unpack ${A} einfo "Unpacking sandbox for ABI=${ABI}..." mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}" + cd ${S%/}-${ABI} + # Fix getcwd, bug #98419. + epatch ${FILESDIR}/${P}-uclibc-getcwd.patch done } @@ -65,9 +71,15 @@ src_compile() { ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:" ewarn "FEATURES=-sandbox emerge sandbox" + local iscross=0 + [[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscros=1 + OABI="${ABI}" for ABI in $(get_install_abis); do export ABI + export CHOST=$(get_abi_CHOST) + [[ ${iscross} == 0 ]] && export CBUILD=${CHOST} + cd ${S}-${ABI} einfo "Configuring sandbox for ABI=${ABI}..." @@ -86,7 +98,6 @@ src_install() { OABI="${ABI}" for ABI in $(get_install_abis); do - export ABI cd ${S}-${ABI} einfo "Installing sandbox for ABI=${ABI}..." make DESTDIR="${D}" install || die "make install failed for ${ABI}" |