diff options
Diffstat (limited to 'sys-apps/sandbox')
-rw-r--r-- | sys-apps/sandbox/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.10.ebuild | 11 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.11.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.12.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.13.ebuild | 12 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.9.ebuild | 11 |
6 files changed, 51 insertions, 14 deletions
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog index 38fa09519555..facd01358b15 100644 --- a/sys-apps/sandbox/ChangeLog +++ b/sys-apps/sandbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/sandbox # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.46 2005/09/12 07:19:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.47 2005/10/07 03:30:33 eradicator Exp $ + + 07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> + sandbox-1.2.9.ebuild, sandbox-1.2.10.ebuild, sandbox-1.2.11.ebuild, + sandbox-1.2.12.ebuild, sandbox-1.2.13.ebuild: + Some changes for amd64 2006.0. *sandbox-1.2.13 (12 Sep 2005) diff --git a/sys-apps/sandbox/sandbox-1.2.10.ebuild b/sys-apps/sandbox/sandbox-1.2.10.ebuild index 78795e50adcb..298c8a0e9e2c 100644 --- a/sys-apps/sandbox/sandbox-1.2.10.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.10.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/sandbox/sandbox-1.2.10.ebuild,v 1.11 2005/07/18 08:19:20 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.10.ebuild,v 1.12 2005/10/07 03:30:33 eradicator Exp $ # # don't monkey with this ebuild unless contacting portage devs. @@ -29,6 +29,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 @@ -68,9 +70,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}..." @@ -89,7 +97,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}" diff --git a/sys-apps/sandbox/sandbox-1.2.11.ebuild b/sys-apps/sandbox/sandbox-1.2.11.ebuild index 48ff235af0cf..dd7dfbddc33e 100644 --- a/sys-apps/sandbox/sandbox-1.2.11.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.11.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/sandbox/sandbox-1.2.11.ebuild,v 1.13 2005/07/24 09:06:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.11.ebuild,v 1.14 2005/10/07 03:30:33 eradicator Exp $ # # don't monkey with this ebuild unless contacting portage devs. @@ -29,6 +29,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 @@ -65,9 +67,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 +94,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}" @@ -106,4 +113,3 @@ pkg_preinst() { chown root:portage ${IMAGE}/var/log/sandbox chmod 0770 ${IMAGE}/var/log/sandbox } - diff --git a/sys-apps/sandbox/sandbox-1.2.12.ebuild b/sys-apps/sandbox/sandbox-1.2.12.ebuild index 28a65eedebf7..65c3829b4f4d 100644 --- a/sys-apps/sandbox/sandbox-1.2.12.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.12.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/sandbox/sandbox-1.2.12.ebuild,v 1.8 2005/08/30 23:47:16 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.12.ebuild,v 1.9 2005/10/07 03:30:33 eradicator Exp $ # # don't monkey with this ebuild unless contacting portage devs. @@ -29,6 +29,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 @@ -65,9 +67,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 +94,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}" @@ -106,4 +113,3 @@ pkg_preinst() { chown root:portage ${IMAGE}/var/log/sandbox chmod 0770 ${IMAGE}/var/log/sandbox } - diff --git a/sys-apps/sandbox/sandbox-1.2.13.ebuild b/sys-apps/sandbox/sandbox-1.2.13.ebuild index f2ca466b8652..a83cf55f6219 100644 --- a/sys-apps/sandbox/sandbox-1.2.13.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.13.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/sandbox/sandbox-1.2.13.ebuild,v 1.1 2005/09/12 07:19:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.13.ebuild,v 1.2 2005/10/07 03:30:33 eradicator Exp $ # # don't monkey with this ebuild unless contacting portage devs. @@ -29,6 +29,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 @@ -65,9 +67,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 +94,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}" @@ -106,4 +113,3 @@ pkg_preinst() { chown root:portage ${IMAGE}/var/log/sandbox chmod 0770 ${IMAGE}/var/log/sandbox } - diff --git a/sys-apps/sandbox/sandbox-1.2.9.ebuild b/sys-apps/sandbox/sandbox-1.2.9.ebuild index 93b3384d1b81..a5346c268dcb 100644 --- a/sys-apps/sandbox/sandbox-1.2.9.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.9.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/sandbox/sandbox-1.2.9.ebuild,v 1.4 2005/07/14 15:35:23 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.5 2005/10/07 03:30:33 eradicator Exp $ # # don't monkey with this ebuild unless contacting portage devs. @@ -30,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 @@ -69,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}..." @@ -90,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}" |