Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 250322
Collapse All | Expand All

(-)/usr/sbin/crossdev.orig (-18 / +2 lines)
Lines 563-577 Link Here
563
set_portage dev-util insight
563
set_portage dev-util insight
564
564
565
#################
565
#################
566
emerged_with_use() {
567
	local pkg=$1 use=$2
568
	grep -qs ${use} /var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
569
}
570
set_eopts_on_pkg_status() {
571
	emerged_with_use "$@" \
572
		&& EOPTS=${EOPTS_DEF} \
573
		|| EOPTS=${EOPTS_UP}
574
}
575
doemerge() {
566
doemerge() {
576
	[[ $1 == "[none]" ]] && return 0
567
	[[ $1 == "[none]" ]] && return 0
577
568
Lines 598-606 Link Here
598
}
589
}
599
590
600
# we include the '-u' so that we don't re-emerge packages
591
# we include the '-u' so that we don't re-emerge packages
601
EOPTS_DEF="${UOPTS} --nodeps --oneshot"
592
EOPTS="${UOPTS} --nodeps --oneshot -u --newuse"
602
EOPTS_UP="${EOPTS_DEF} -u"
603
EOPTS=${EOPTS_UP}
604
# keep things like --ask from screwing us up
593
# keep things like --ask from screwing us up
605
export EMERGE_DEFAULT_OPTS=""
594
export EMERGE_DEFAULT_OPTS=""
606
595
Lines 629-657 Link Here
629
USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
618
USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
630
	doemerge ${LPKG} ${LPKG}-headers
619
	doemerge ${LPKG} ${LPKG}-headers
631
fi
620
fi
632
USE="${GUSE} ${USE} ${GUSE_DISABLE}" CROSSCOMPILE_OPTS="bootstrap" \
621
USE="${GUSE} ${USE} ${GUSE_DISABLE}" \
633
	doemerge ${GPKG} ${GPKG}-stage1
622
	doemerge ${GPKG} ${GPKG}-stage1
634
623
635
is_s2 || exit 0
624
is_s2 || exit 0
636
set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only
637
USE="${KUSE} ${USE}" CROSSCOMPILE_OPTS="" \
625
USE="${KUSE} ${USE}" CROSSCOMPILE_OPTS="" \
638
	doemerge ${KPKG}
626
	doemerge ${KPKG}
639
627
640
is_s3 || exit 0
628
is_s3 || exit 0
641
[[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc"
629
[[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc"
642
set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only
643
USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="" \
630
USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="" \
644
	doemerge ${LPKG}
631
	doemerge ${LPKG}
645
632
646
is_s4 || exit 0
633
is_s4 || exit 0
647
set_eopts_on_pkg_status ${GPKG} crosscompile_opts_bootstrap
648
EOPTS="${EOPTS_UP} --newuse"
649
USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \
634
USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \
650
	doemerge ${GPKG} ${GPKG}-stage2
635
	doemerge ${GPKG} ${GPKG}-stage2
651
636
652
}
637
}
653
638
654
EOPTS="${EOPTS_UP} --newuse"
655
ex_gcc && USE="${GUSE} ${USE}" doemerge ${GPKG} ${GPKG}-extra
639
ex_gcc && USE="${GUSE} ${USE}" doemerge ${GPKG} ${GPKG}-extra
656
ex_gdb && doemerge gdb
640
ex_gdb && doemerge gdb
657
ex_insight && doemerge insight
641
ex_insight && doemerge insight

Return to bug 250322