From 6b1886a28b8fd11498a1286882d454390c0ec4cd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 8 Oct 2005 16:58:42 +0000 Subject: [PATCH] Add support for passing -d to portage #108383 by Jan Kobler and allow env USE/ABI to be passed in. Package-Manager: portage-2.0.53_rc4 --- sys-devel/crossdev/ChangeLog | 9 ++++++++- sys-devel/crossdev/Manifest | 14 +++++++------- ...ev-0.9.9-r2.ebuild => crossdev-0.9.9-r3.ebuild} | 2 +- sys-devel/crossdev/files/crossdev | 14 +++++++------- ...-crossdev-0.9.9-r2 => digest-crossdev-0.9.9-r3} | 0 5 files changed, 23 insertions(+), 16 deletions(-) rename sys-devel/crossdev/{crossdev-0.9.9-r2.ebuild => crossdev-0.9.9-r3.ebuild} (90%) rename sys-devel/crossdev/files/{digest-crossdev-0.9.9-r2 => digest-crossdev-0.9.9-r3} (100%) diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog index d5e65786c846..ccfa2954c010 100644 --- a/sys-devel/crossdev/ChangeLog +++ b/sys-devel/crossdev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/crossdev # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.24 2005/08/29 23:26:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.25 2005/10/08 16:58:41 vapier Exp $ + +*crossdev-0.9.9-r3 (08 Oct 2005) + + 08 Oct 2005; Mike Frysinger files/crossdev, + -crossdev-0.9.9-r2.ebuild, +crossdev-0.9.9-r3.ebuild: + Add support for passing -d to portage #108383 by Jan Kobler and allow env + USE/ABI to be passed in. *crossdev-0.9.9-r2 (29 Aug 2005) diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest index 986e0c5f90e7..e92487e3e849 100644 --- a/sys-devel/crossdev/Manifest +++ b/sys-devel/crossdev/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 582c83b33545f1de39861e08f42859e2 ChangeLog 5215 +MD5 091fb844f716a3f89969a7c6cc9a5eea crossdev-0.9.9-r3.ebuild 596 +MD5 122ff98d0346cd0b02d298bf6ee5aeba files/crossdev 12868 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.9-r3 0 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222 -MD5 332c7e0793c9a75cd5de61fcf4e7a238 ChangeLog 4955 -MD5 c723d88c7e76371dd79cf264941cea9e crossdev-0.9.9-r2.ebuild 596 -MD5 596e66e68e98e2f77d02760ab321f6cb files/crossdev 12839 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.9-r2 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDMM1ZgIKl8Uu19MoRArJ9AJwNpjXSZJ/8BAfZCDmd0To9k6WEmQCcCdT4 -Qa7HkG655CcW+NVBDKzmEt4= -=Hkf4 +iD8DBQFDR/s1gIKl8Uu19MoRArqRAJoCla9+nZI6vE7WC8KvUgFcO2JuKgCcC8S6 +UCaXkJVeweQRoruAET9Z0Mg= +=hcjo -----END PGP SIGNATURE----- diff --git a/sys-devel/crossdev/crossdev-0.9.9-r2.ebuild b/sys-devel/crossdev/crossdev-0.9.9-r3.ebuild similarity index 90% rename from sys-devel/crossdev/crossdev-0.9.9-r2.ebuild rename to sys-devel/crossdev/crossdev-0.9.9-r3.ebuild index c4c0fe1066d0..f948be796d0d 100644 --- a/sys-devel/crossdev/crossdev-0.9.9-r2.ebuild +++ b/sys-devel/crossdev/crossdev-0.9.9-r3.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-devel/crossdev/crossdev-0.9.9-r2.ebuild,v 1.1 2005/08/29 23:26:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.9-r3.ebuild,v 1.1 2005/10/08 16:58:41 vapier Exp $ DESCRIPTION="Gentoo Cross-toolchain generator" HOMEPAGE="http://www.gentoo.org/" diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev index 9ebc08a583a5..af62742f5786 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.35 2005/09/21 03:02:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.36 2005/10/08 16:58:41 vapier Exp $ cd / @@ -31,7 +31,7 @@ ${GOOD}Options${NORMAL}: ${GOOD}--k, --kernel${NORMAL} ver Specify version of kernel headers to use ${GOOD}--l, --libc${NORMAL} ver Specify version of libc to use ${GOOD}-C, --clean${NORMAL} target Uninstall specified target - ${GOOD}-b, -p, -v${NORMAL} Options to pass to emerge (see emerge(1)) + ${GOOD}-b, -d, -p, -v${NORMAL} Options to pass to emerge (see emerge(1)) Basic Targets: ${GOOD}-s0, --stage0${NORMAL} Build just binutils ${GOOD}-s1, --stage1${NORMAL} Also build a C compiler (no libc/C++) @@ -273,7 +273,7 @@ while [[ $# -gt 0 ]] ; do --ex-only) EX_FAST="yes";; --ex-gcc) EX_GCC="yes";; --ex-gdb) EX_GDB="yes";; - -b|-p|-v) UOPTS="${UOPTS} $1";; + -b|-d|-p|-v) UOPTS="${UOPTS} $1";; -pv|-vp) UOPTS="${UOPTS} -p -v";; -h|--help) usage;; -*) eerror "UNKNOWN OPTION: '$1'" ; usage 1;; @@ -433,25 +433,25 @@ doemerge() { EOPTS="${UOPTS} -u --nodeps" # make sure multilib crap doesn't screw us over -export ABI="pos" LIBDIR_pos="lib" CFLAGS_pos="" LDFLAGS_pos="" +export ABI=${ABI:-pos} LIBDIR_pos="lib" CFLAGS_pos="" LDFLAGS_pos="" ex_fast || { doemerge ${BPKG} is_s1 || exit 0 -USE="-boundschecking -fortran -gcj -objc nocxx -static" \ +USE="${USE} -boundschecking -fortran -gcj -objc nocxx -static" \ doemerge ${GPKG} ${GPKG}-stage1 is_s2 || exit 0 doemerge ${KPKG} is_s3 || exit 0 -USE=$TARCH doemerge ${LPKG} +USE="${USE} $TARCH" doemerge ${LPKG} is_s4 || exit 0 if ! type -p ${CTARGET}-g++ > /dev/null ; then EOPTS="${UOPTS} --nodeps" fi -USE="-fortran -gcj -objc" \ +USE="${USE} -fortran -gcj -objc" \ doemerge ${GPKG} ${GPKG}-stage2 } diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.9-r2 b/sys-devel/crossdev/files/digest-crossdev-0.9.9-r3 similarity index 100% rename from sys-devel/crossdev/files/digest-crossdev-0.9.9-r2 rename to sys-devel/crossdev/files/digest-crossdev-0.9.9-r3 -- 2.26.2