[patch] crossdev.patch

crossdev.patch (text/plain), 3.51 KB, created by Massimo Burcheri on 2012-07-31 15:41:18 UTC

5c5
< CROSSDEV_VER="20120531"
---
> CROSSDEV_VER="20120531_prefixmod"
7c7
< cd /
---
> cd $EPREFIX/
15c15
< CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
---
> CONFIGROOT="${EPREFIX}/${PORTAGE_CONFIGROOT}/etc/portage"
17c17
< source /etc/init.d/functions.sh || exit 1
---
> source $EPREFIX/etc/init.d/functions.sh || exit 1
304c304
<       mkdir -p "${PORT_LOGDIR}"
---
>       mkdir -p "${EPREFIX}/${PORT_LOGDIR}"
324,325c324,325
<       rm -f /etc/revdep-rebuild/05cross-${CTARGET}
<       rmdir /etc/revdep-rebuild 2>/dev/null
---
>       rm -f $EPREFIX/etc/revdep-rebuild/05cross-${CTARGET}
>       rmdir $EPREFIX/etc/revdep-rebuild 2>/dev/null
327,328c327,328
<       rmdir /var/db/pkg/cross-${CTARGET} 2>/dev/null
<       if [[ -d /var/db/pkg/cross-${CTARGET} ]] ; then
---
>       rmdir $EPREFIX/var/db/pkg/cross-${CTARGET} 2>/dev/null
>       if [[ -d $EPREFIX/var/db/pkg/cross-${CTARGET} ]] ; then
330c330
<               cd /var/db/pkg
---
>               cd $EPREFIX/var/db/pkg
343c343
<               rm -f /usr/bin/${CTARGET}-${f} /usr/${CTARGET}/bin/${f}
---
>               rm -f $EPREFIX/usr/bin/${CTARGET}-${f} $EPREFIX/usr/${CTARGET}/bin/${f}
345,348c345,348
<       rm -f /usr/${CTARGET}/{sys-include,usr}
<       rmdir /usr/${CTARGET}/{include/asm,include} 2>/dev/null
<       rm -f /usr/bin/${CTARGET}-{gcc,{c,g}++,cpp,gfortran,gcov}
<       rm -f /etc/env.d/{binutils,gcc}/config-${CTARGET}
---
>       rm -f $EPREFIX/usr/${CTARGET}/{sys-include,usr}
>       rmdir $EPREFIX/usr/${CTARGET}/{include/asm,include} 2>/dev/null
>       rm -f $EPREFIX/usr/bin/${CTARGET}-{gcc,{c,g}++,cpp,gfortran,gcov}
>       rm -f $EPREFIX/etc/env.d/{binutils,gcc}/config-${CTARGET}
351,352c351,352
<       [[ -e /var/db/pkg/cross-${CTARGET} ]] && rmdir /var/db/pkg/cross-${CTARGET}
<       rm -f /usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} /usr/bin/emerge-${CTARGET}
---
>       [[ -e $EPREFIX/var/db/pkg/cross-${CTARGET} ]] && rmdir $EPREFIX/var/db/pkg/cross-${CTARGET}
>       rm -f $EPREFIX/usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} $EPREFIX/usr/bin/emerge-${CTARGET}
360c360
<       find /usr/share/crossdev/etc/ -type f | \
---
>       find $EPREFIX/usr/share/crossdev/etc/ -type f | \
374c374
<       for d in /usr/lib/gcc{,-lib}/${CTARGET} /usr/${CTARGET} ; do
---
>       for d in $EPREFIX/usr/lib/gcc{,-lib}/${CTARGET} $EPREFIX/usr/${CTARGET} ; do
587c587
<       eerror "PORTDIR_OVERLAY in your make.conf.  A standard setting is: /usr/local/portage"
---
>       eerror "PORTDIR_OVERLAY in your make.conf.  A standard setting is: $EPREFIX/usr/local/portage"
725c725
<       ) >& "${PORT_LOGDIR}"/cross-${CTARGET}-info.log || exit 1
---
>       ) >& "${EPREFIX}/${PORT_LOGDIR}"/cross-${CTARGET}-info.log || exit 1
831c831
<       COLLISION_IGNORE="\${COLLISION_IGNORE} /usr/lib/debug/.build-id"
---
>       COLLISION_IGNORE="\${COLLISION_IGNORE} $EPREFIX/usr/lib/debug/.build-id"
894c894
<       mkdir -p "${meta}"
---
>       mkdir -p "${EPREFIX}/${meta}"
970,971c970,971
< mkdir -p /etc/revdep-rebuild
< echo "SEARCH_DIRS_MASK=/usr/${CTARGET}" > /etc/revdep-rebuild/05cross-${CTARGET}
---
> mkdir -p $EPREFIX/etc/revdep-rebuild
> echo "SEARCH_DIRS_MASK=/usr/${CTARGET}" > $EPREFIX/etc/revdep-rebuild/05cross-${CTARGET}
978c978
< mkdir -p /usr/${CTARGET}
---
> mkdir -p $EPREFIX/usr/${CTARGET}
984c984
<       grep -qs ${use} /var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
---
>       grep -qs ${use} $EPREFIX/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
1002c1002
<       local logfile=${PORT_LOGDIR}/${category}
---
>       local logfile="${EPREFIX}/${PORT_LOGDIR}/${category}"