From 51bd2013a0b76b66facbb11d2ef4331f67d01b27 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 12 Mar 2005 19:33:50 +0000 Subject: Add a --stage0 (for binutils), use a diff PORTAGE_TMPDIR, and make sure that the diff PKGDIR is actually used. (Portage version: 2.0.51.19) --- sys-devel/crossdev/ChangeLog | 9 ++++++++- sys-devel/crossdev/crossdev-0.9.1-r1.ebuild | 21 --------------------- sys-devel/crossdev/crossdev-0.9.1-r2.ebuild | 21 +++++++++++++++++++++ sys-devel/crossdev/files/crossdev | 13 ++++++++++--- sys-devel/crossdev/files/digest-crossdev-0.9.1-r1 | 0 sys-devel/crossdev/files/digest-crossdev-0.9.1-r2 | 0 6 files changed, 39 insertions(+), 25 deletions(-) delete mode 100644 sys-devel/crossdev/crossdev-0.9.1-r1.ebuild create mode 100644 sys-devel/crossdev/crossdev-0.9.1-r2.ebuild delete mode 100644 sys-devel/crossdev/files/digest-crossdev-0.9.1-r1 create mode 100644 sys-devel/crossdev/files/digest-crossdev-0.9.1-r2 (limited to 'sys-devel/crossdev') diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog index 339e9a62d395..a7cc7395a47b 100644 --- a/sys-devel/crossdev/ChangeLog +++ b/sys-devel/crossdev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/crossdev # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.12 2005/03/10 22:49:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.13 2005/03/12 19:33:50 vapier Exp $ + +*crossdev-0.9.1-r2 (12 Mar 2005) + + 12 Mar 2005; Mike Frysinger files/crossdev, + -crossdev-0.9.1-r1.ebuild, +crossdev-0.9.1-r2.ebuild: + Add a --stage0 (for binutils), use a diff PORTAGE_TMPDIR, and make sure that + the diff PKGDIR is actually used. *crossdev-0.9.1-r1 (10 Mar 2005) diff --git a/sys-devel/crossdev/crossdev-0.9.1-r1.ebuild b/sys-devel/crossdev/crossdev-0.9.1-r1.ebuild deleted file mode 100644 index 5ec955c808ca..000000000000 --- a/sys-devel/crossdev/crossdev-0.9.1-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.1-r1.ebuild,v 1.1 2005/03/10 22:49:08 vapier Exp $ - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="sys-apps/portage - app-shells/bash - sys-apps/coreutils" - -src_install() { - dobin "${FILESDIR}"/crossdev || die - dosed "s:GENTOO_PV:${PV}:" /usr/bin/crossdev -} diff --git a/sys-devel/crossdev/crossdev-0.9.1-r2.ebuild b/sys-devel/crossdev/crossdev-0.9.1-r2.ebuild new file mode 100644 index 000000000000..caa01e397e6d --- /dev/null +++ b/sys-devel/crossdev/crossdev-0.9.1-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.1-r2.ebuild,v 1.1 2005/03/12 19:33:50 vapier Exp $ + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND="sys-apps/portage + app-shells/bash + sys-apps/coreutils" + +src_install() { + dobin "${FILESDIR}"/crossdev || die + dosed "s:GENTOO_PV:${PV}:" /usr/bin/crossdev +} diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev index f4cf3e6e6e0f..37ef24a659c3 100755 --- a/sys-devel/crossdev/files/crossdev +++ b/sys-devel/crossdev/files/crossdev @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.9 2005/03/10 22:49:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.10 2005/03/12 19:33:50 vapier Exp $ source /sbin/functions.sh || exit 1 die() { @@ -28,6 +28,7 @@ ${GOOD}Options${NORMAL}: ${GOOD}-C, --clean${NORMAL} target Uninstall specified target ${GOOD}-a, -b, -p, -v${NORMAL} Options to pass to emerge (see emerge(1)) + ${GOOD}-s0, --stage0${NORMAL} Build just binutils ${GOOD}-s1, --stage1${NORMAL} Build a C compiler (no libc/C++) ${GOOD}-s2, --stage2${NORMAL} Build a C compiler & libc (no C++) ${GOOD}-s3, --stage3${NORMAL} Build a C/C++ compiler & libc [default] @@ -90,8 +91,10 @@ setup_portage_vars() { PORTDIR=$(portageq envvar PORTDIR) PORT_LOGDIR=$(portageq envvar PORT_LOGDIR) PORT_LOGDIR=${PORT_LOGDIR:-/var/log/portage} - PKGDIR=$(portageq envvar PKGDIR)/cross/${CTARGET} + export PKGDIR=$(portageq envvar PKGDIR)/cross/${CTARGET} + export PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR)/cross/${CTARGET} [[ ! -d ${PORT_LOGDIR} ]] && mkdir -p ${PORT_LOGDIR} + [[ ! -d ${PORTAGE_TMPDIR} ]] && mkdir -p ${PORTAGE_TMPDIR} } uninstall() { @@ -142,6 +145,7 @@ TARCH= HARCH=$(env -uARCH portageq envvar ARCH) CTARGET= STAGE=4 +STAGE_DISP=( "binutils" "gcc C-only" "libc" "gcc C/C++" ) BVER="[latest]" ; BUSE="" GVER="[latest]" ; GUSE="" KVER="[latest]" ; KUSE="" @@ -191,9 +195,10 @@ hr einfo "Host Portage ARCH: ${HARCH}" einfo "Target Portage ARCH: ${TARCH}" einfo "Target System: ${CTARGET}" -einfo "Stage: ${STAGE}" +einfo "Stage: ${STAGE} (${STAGE_DISP[${STAGE}]})" echo einfo "binutils: ${BVER}" +[[ ${STAGE} -gt 0 ]] && \ einfo "gcc: ${GVER}" [[ ${STAGE} -gt 1 ]] && \ einfo "linux-headers: ${KVER}" && \ @@ -202,6 +207,7 @@ echo einfo "PORTDIR_OVERLAY: ${PORTDIR_OVERLAY}" einfo "PORT_LOGDIR: ${PORT_LOGDIR}" einfo "PKGDIR: ${PKGDIR}" +einfo "PORTAGE_TMPDIR: ${PORTAGE_TMPDIR}" hr ) >& ${PORT_LOGDIR}/cross-${CTARGET}-info.log cat ${PORT_LOGDIR}/cross-${CTARGET}-info.log @@ -266,6 +272,7 @@ doemerge() { EOPTS="${UOPTS} -u --nodeps" doemerge binutils +[[ ${STAGE} -gt 0 ]] || exit 0 USE="-boundschecking -fortran -gcj -objc nocxx -static" \ doemerge gcc gcc-stage1 [[ ${STAGE} -gt 1 ]] || exit 0 diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.1-r1 b/sys-devel/crossdev/files/digest-crossdev-0.9.1-r1 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.1-r2 b/sys-devel/crossdev/files/digest-crossdev-0.9.1-r2 new file mode 100644 index 000000000000..e69de29bb2d1 -- cgit v1.2.3-65-gdbad