|
Line
Link Here
|
| 0 |
-- a/crossdev |
0 |
++ a/crossdev |
|
Lines 2-8
Link Here
|
| 2 |
# Copyright 1999-2011 Gentoo Foundation |
2 |
# Copyright 1999-2011 Gentoo Foundation |
| 3 |
# Distributed under the terms of the GNU General Public License v2 |
3 |
# Distributed under the terms of the GNU General Public License v2 |
| 4 |
|
4 |
|
| 5 |
CROSSDEV_VER="@CDEVPV@" |
5 |
CROSSDEV_VER="72b8767e712ba8615331a035c8bcecaf5492347e" |
| 6 |
|
6 |
|
| 7 |
cd / |
7 |
cd / |
| 8 |
umask 0022 #159111 |
8 |
umask 0022 #159111 |
|
Lines 289-295
Link Here
|
| 289 |
[[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ |
289 |
[[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ |
| 290 |
&& rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} |
290 |
&& rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} |
| 291 |
sed -i -e "/^cross-${CTARGET}$/d" "${CONFIGROOT}"/categories |
291 |
sed -i -e "/^cross-${CTARGET}$/d" "${CONFIGROOT}"/categories |
| 292 |
for f in package.{mask,keywords,use} profile/package.use.force ; do |
292 |
for f in package.{mask,keywords,use} profile/package.use.{force,mask} ; do |
| 293 |
f="${CONFIGROOT}/${f}" |
293 |
f="${CONFIGROOT}/${f}" |
| 294 |
if [[ -d ${f} ]] ; then |
294 |
if [[ -d ${f} ]] ; then |
| 295 |
rm -f "${f}"/cross-${CTARGET} |
295 |
rm -f "${f}"/cross-${CTARGET} |
|
Lines 662-667
Link Here
|
| 662 |
output=$(_set_portage_file ${pkg} profile/package.use.force) |
662 |
output=$(_set_portage_file ${pkg} profile/package.use.force) |
| 663 |
echo "cross-${CTARGET}/${pkg} ${use}" >> ${output} |
663 |
echo "cross-${CTARGET}/${pkg} ${use}" >> ${output} |
| 664 |
} |
664 |
} |
|
|
665 |
set_use_mask() { |
| 666 |
local pkg=$1 output use=${@:2} |
| 667 |
[[ -z ${use} ]] && return 0 |
| 668 |
output=$(_set_portage_file ${pkg} profile/package.use.mask) |
| 669 |
echo "cross-${CTARGET}/${pkg} ${use}" >> ${output} |
| 670 |
} |
| 665 |
set_links() { |
671 |
set_links() { |
| 666 |
local cat=$1 pkg=$2 ovl=$3 |
672 |
local cat=$1 pkg=$2 ovl=$3 |
| 667 |
local s srcdir=${PORTDIR} d |
673 |
local s srcdir=${PORTDIR} d |
|
Lines 711-719
Link Here
|
| 711 |
|
717 |
|
| 712 |
[[ ${pkg} == "[none]" ]] && return 0 |
718 |
[[ ${pkg} == "[none]" ]] && return 0 |
| 713 |
|
719 |
|
|
|
720 |
case ${CTARGET} in |
| 721 |
# avr requires multilib, that provides |
| 722 |
# libgcc for all sub-architectures #378387 |
| 723 |
avr*) set_use_force ${pkg} multilib |
| 724 |
set_use_mask ${pkg} -multilib;; |
| 725 |
*) set_use_force ${pkg} -multilib;; |
| 726 |
esac |
| 727 |
|
| 714 |
set_keywords ${pkg} ${ver} |
728 |
set_keywords ${pkg} ${ver} |
| 715 |
set_use ${pkg} ${use} |
729 |
set_use ${pkg} ${use} |
| 716 |
set_use_force ${pkg} -multilib |
|
|
| 717 |
set_links ${cat} ${pkg} "${ovl}" |
730 |
set_links ${cat} ${pkg} "${ovl}" |
| 718 |
set_env ${pkg} "${env}" |
731 |
set_env ${pkg} "${env}" |
| 719 |
} |
732 |
} |
|
Lines 767-773
Link Here
|
| 767 |
|| echo cross-${CTARGET} >> "${CONFIGROOT}"/categories |
780 |
|| echo cross-${CTARGET} >> "${CONFIGROOT}"/categories |
| 768 |
mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1 |
781 |
mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1 |
| 769 |
cd "${CONFIGROOT}" |
782 |
cd "${CONFIGROOT}" |
| 770 |
for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/package.use.force ; do |
783 |
for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask}; do |
| 771 |
[[ -f ${f} ]] && continue |
784 |
[[ -f ${f} ]] && continue |
| 772 |
mkdir -p ${f} || exit 1 |
785 |
mkdir -p ${f} || exit 1 |
| 773 |
rm -f ${f}/cross-${CTARGET} |
786 |
rm -f ${f}/cross-${CTARGET} |
