diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-10-29 09:16:51 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-10-29 09:16:51 +0100 |
| commit | 8bc1937498423245cc05b097e2c957f647e4d0d8 (patch) | |
| tree | e1af46b1032b050939c7cf157ad76dc3888be2f1 /wrappers | |
| parent | cross-fix-root: rewrite with stuff from uClinux-dist (diff) | |
| download | crossdev-8bc1937498423245cc05b097e2c957f647e4d0d8.tar.gz crossdev-8bc1937498423245cc05b097e2c957f647e4d0d8.tar.bz2 crossdev-8bc1937498423245cc05b097e2c957f647e4d0d8.zip | |
Setup PORTDIR and DISTDIR in the cross environment make.conf. Bug #244671
This makes it work out of the box on setups with custom PORTDIR and DISTDIR
Diffstat (limited to 'wrappers')
| -rwxr-xr-x | wrappers/emerge-wrapper | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 45b2010..634f2e7 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -25,6 +25,8 @@ cross_wrap_etc() { [[ $ARCH != "" ]] && sed -i -e s/__ARCH__/${ARCH}/g ${conf} sed -i -e s/__CHOST__/${chost}/g -e s/__CBUILD__/${CBUILD}/g ${conf} echo MAKEOPTS=-j$(cat /proc/cpuinfo | grep processor| wc -l) >> ${conf} + [[ ${portdir} != "" ]] && echo PORTDIR=\"${portdir}\" >> ${conf} + [[ ${distdir} != "" ]] && echo DISTDIR=\"${distdir}\" >> ${conf} [[ ${overlay} != "" ]] && echo PORTDIR_OVERLAY=\"${overlay}\" >> ${conf} } @@ -35,6 +37,8 @@ cross_init() { chosts=$(gcc-config -l | awk '{print $2}'| grep -- -| cut -d '-' -f 1-4| sort -u) cd $dn || { echo "Failed to cd to $dn" ; exit 1; } export overlay=$(portageq envvar PORTDIR_OVERLAY) + export portdir=$(portageq envvar PORTDIR) + export distdir=$(portageq envvar DISTDIR) for chost in $chosts; do [[ $chost == $CBUILD ]] && continue |