From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RxOvs-0003ne-PB for garchives@archives.gentoo.org; Tue, 14 Feb 2012 20:25:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3072E0AE3; Tue, 14 Feb 2012 20:24:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 91E6FE0AE3 for ; Tue, 14 Feb 2012 20:24:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC01F1B401C for ; Tue, 14 Feb 2012 20:24:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7A227E5406 for ; Tue, 14 Feb 2012 20:24:50 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1326426870.dcc0180a31c46ea8a3cbe05e0bc5bd162e9ce015.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: dcc0180a31c46ea8a3cbe05e0bc5bd162e9ce015 X-VCS-Branch: master Date: Tue, 14 Feb 2012 20:24:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b40f80b4-c1b7-470a-80d4-63e3c6f01402 X-Archives-Hash: 0ef2571cdf99094312f20c721e6d65d5 commit: dcc0180a31c46ea8a3cbe05e0bc5bd162e9ce015 Author: Mike Frysinger gentoo org> AuthorDate: Fri Jan 13 03:54:30 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Jan 13 03:54:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3Ddcc0180a crossdev: make sure to always process extra pkgs For targets which do not go through all stages (like arm-non-eabi), we end up always exiting early before we get a chance to process the extra stuff (like gdb). So allow the extra args to always be processed. That's the only functional change here. The rest is finally using proper if statements and indenting relevant blocks of code. It's grown too much at this point to get away with the previous `foo && bar` logic. Reported-by: David Hendricks google.com> Signed-off-by: Mike Frysinger gentoo.org> --- crossdev | 87 ++++++++++++++++++++++++++++++++++++++++----------------= ----- 1 files changed, 57 insertions(+), 30 deletions(-) diff --git a/crossdev b/crossdev index 35e2a6b..ed625ec 100755 --- a/crossdev +++ b/crossdev @@ -905,40 +905,67 @@ USE=3D"${USE} -selinux" # only allow UCLIBC_CPU from env, not from make.conf/profile export UCLIBC_CPU=3D${UCLIBC_CPU} =20 -ex_fast || { +if ! ex_fast ; then + + # stage 0: binutils + doemerge ${BPKG} + + # stage1: bare C compiler + if is_s1 ; then + + # first install headers if requested + if with_headers ; then + # install kernel headers (since the C library often uses them) + USE=3D"${KUSE} ${USE}" \ + CROSSCOMPILE_OPTS=3D"headers-only" \ + doemerge ${KPKG} ${KPKG}-quick + + if [[ -n ${LPKG} ]] ; then + # install C library headers + USE=3D"${LUSE} ${USE}" \ + CROSSCOMPILE_OPTS=3D"headers-only" \ + doemerge ${LPKG} ${LPKG}-headers + fi + fi =20 -doemerge ${BPKG} + # then finally get around to the C compiler + USE=3D"${GUSE} ${USE} ${GUSE_DISABLE_STAGE_1}" \ + CROSSCOMPILE_OPTS=3D"bootstrap" \ + doemerge ${GPKG} ${GPKG}-stage1 + fi =20 -is_s1 || exit 0 -if with_headers ; then -USE=3D"${KUSE} ${USE}" CROSSCOMPILE_OPTS=3D"headers-only" \ - doemerge ${KPKG} ${KPKG}-quick -[[ -n ${LPKG} ]] && \ -USE=3D"${LUSE} ${USE}" CROSSCOMPILE_OPTS=3D"headers-only" \ - doemerge ${LPKG} ${LPKG}-headers -fi -USE=3D"${GUSE} ${USE} ${GUSE_DISABLE_STAGE_1}" CROSSCOMPILE_OPTS=3D"boot= strap" \ - doemerge ${GPKG} ${GPKG}-stage1 - -is_s2 || exit 0 -set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only -USE=3D"${KUSE} ${USE}" CROSSCOMPILE_OPTS=3D"" \ - doemerge ${KPKG} - -is_s3 || exit 0 -[[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc" -set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only -USE=3D"${LUSE} ${USE}" CROSSCOMPILE_OPTS=3D"" \ - doemerge ${LPKG} - -is_s4 || exit 0 -set_eopts_on_pkg_status ${GPKG} crosscompile_opts_bootstrap -EOPTS=3D"${EOPTS_UP} --newuse" -USE=3D"${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \ - doemerge ${GPKG} ${GPKG}-stage2 + # stage2: kernel headers + if is_s2 ; then + set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only =20 -} + USE=3D"${KUSE} ${USE}" \ + CROSSCOMPILE_OPTS=3D"" \ + doemerge ${KPKG} + fi + + # stage3: full C library (headers/libs/etc...) + if is_s3 ; then + [[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc" + + set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only + + USE=3D"${LUSE} ${USE}" \ + CROSSCOMPILE_OPTS=3D"" \ + doemerge ${LPKG} + fi + + # stage4: full compiler (C/C++/etc...) + if is_s4 ; then + set_eopts_on_pkg_status ${GPKG} crosscompile_opts_bootstrap + + EOPTS=3D"${EOPTS_UP} --newuse" + USE=3D"${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \ + doemerge ${GPKG} ${GPKG}-stage2 + fi + +fi =20 +# all the extra things (like debuggers) EOPTS=3D"${EOPTS_UP} --newuse" ex_gcc && USE=3D"${GUSE} ${USE}" doemerge ${GPKG} ${GPKG}-extra ex_gdb && USE=3D"${DUSE} ${USE}" doemerge ${DPKG}