Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 287473 Details for
Bug 384167
sys-devel/crossdev: prefix support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
crossdev-20101011-eprefix.patch
crossdev-20101011-eprefix.patch (text/plain), 5.20 KB, created by
Benn Snyder
on 2011-09-23 06:41:53 UTC
(
hide
)
Description:
crossdev-20101011-eprefix.patch
Filename:
MIME Type:
Creator:
Benn Snyder
Created:
2011-09-23 06:41:53 UTC
Size:
5.20 KB
patch
obsolete
>diff -aur crossdev-20101011/crossdev crossdev-20101011-new/crossdev >--- crossdev-20101011/crossdev 2010-10-11 04:52:11.000000000 -0400 >+++ crossdev-20101011-new/crossdev 2011-09-23 02:15:44.000000000 -0400 >@@ -12,9 +12,9 @@ > exit 2 > fi > >-CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage" >+CONFIGROOT="${EPREFIX}/${PORTAGE_CONFIGROOT}/etc/portage" > >-source /etc/init.d/functions.sh || exit 1 >+source "${EPREFIX}"/etc/init.d/functions.sh || exit 1 > esyslog() { :; } > die() { > echo >@@ -256,7 +256,7 @@ > PORTDIR_OVERLAY=${PORTDIR_OVERLAYS%% *} > > # make sure we have a valid logdir >- : ${PORT_LOGDIR:=/var/log/portage} >+ : ${PORT_LOGDIR:="${EPREFIX}"/var/log/portage} > mkdir -p "${PORT_LOGDIR}" > } > >@@ -280,10 +280,10 @@ > rm -rf "${CONFIGROOT}"/env/cross-${CTARGET} > rmdir "${CONFIGROOT}"/env 2>/dev/null > >- 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 > export CLEAN_DELAY=0 >- cd /var/db/pkg >+ cd "${EPREFIX}"/var/db/pkg > for p in cross-${CTARGET}/* ; do > emerge -qC =${p} || exit 1 > done >@@ -295,13 +295,13 @@ > gprof ld nm objcopy objdump ranlib readelf \ > size strings strip windmc windres > do >- rm -f /usr/bin/${CTARGET}-${b} /usr/${CTARGET}/bin/${b} >+ rm -f "${EPREFIX}"/usr/bin/${CTARGET}-${b} "${EPREFIX}"/usr/${CTARGET}/bin/${b} > done >- rm -f /usr/${CTARGET}/{sys-include,usr} >- rm -f /usr/bin/${CTARGET}-{gcc,{c,g}++,cpp,gfortran,gcov} >- rm -f /usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} /usr/bin/emerge-${CTARGET} >- rmdir /usr/${CTARGET}/{include/asm,include} &> /dev/null >- for d in /usr/${CTARGET} /usr/lib/gcc{,-lib}/${CTARGET} ; do >+ rm -f "${EPREFIX}"/usr/${CTARGET}/{sys-include,usr} >+ rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{gcc,{c,g}++,cpp,gfortran,gcov} >+ rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} "${EPREFIX}"/usr/bin/emerge-${CTARGET} >+ rmdir "${EPREFIX}"/usr/${CTARGET}/{include/asm,include} &> /dev/null >+ for d in "${EPREFIX}"/usr/${CTARGET} "${EPREFIX}"/usr/lib/gcc{,-lib}/${CTARGET} ; do > if [[ ! -d ${d} ]] ; then > rm -f "${d}" &> /dev/null > else >@@ -312,8 +312,8 @@ > [[ ${ans} == [Yy]* ]] && rm -rf "${d}" > fi > done >- rm -f /etc/env.d/{binutils,gcc}/config-${CTARGET} >- [[ -e /var/db/pkg/cross-${CTARGET} ]] && rmdir /var/db/pkg/cross-${CTARGET} >+ rm -f "${EPREFIX}"/etc/env.d/{binutils,gcc}/config-${CTARGET} >+ [[ -e "${EPREFIX}"/var/db/pkg/cross-${CTARGET} ]] && rmdir "${EPREFIX}"/var/db/pkg/cross-${CTARGET} > > exit 0 > } >@@ -441,7 +441,7 @@ > eerror "both binutils and binutils-config." > exit 1 > fi >-if ! egrep -qs 'inherit.*toolchain( |$)' /var/db/pkg/sys-devel/gcc-*/*.ebuild ; then >+if ! egrep -qs 'inherit.*toolchain( |$)' "${EPREFIX}"/var/db/pkg/sys-devel/gcc-*/*.ebuild ; then > eerror "Sorry, but your host system needs to have" > eerror "an unstable version of gcc in order to" > eerror "keep from screwing things up." >@@ -642,13 +642,13 @@ > ####################################### > ### Create links for helper scripts ### > >-mkdir -p /usr/${CTARGET} >+mkdir -p "${EPREFIX}"/usr/${CTARGET} > emerge-wrapper --target ${CTARGET} --init || exit 1 > > ################# > emerged_with_use() { > local pkg=$1 use=$2 >- grep -qs ${use} /var/db/pkg/cross-${CTARGET}/${pkg}-*/USE >+ grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE > } > set_eopts_on_pkg_status() { > emerged_with_use "$@" \ >diff -aur crossdev-20101011/settings.mk crossdev-20101011-new/settings.mk >--- crossdev-20101011/settings.mk 2010-10-11 04:52:11.000000000 -0400 >+++ crossdev-20101011-new/settings.mk 2011-09-23 00:23:42.000000000 -0400 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > > DESTDIR ?= >-PREFIX ?= /usr >+PREFIX ?= "${EPREFIX}"/usr > > INSTALL_DIR = install -m 755 -d > INSTALL_EXEC = install -m 755 >diff -aur crossdev-20101011/wrappers/cross-emerge crossdev-20101011-new/wrappers/cross-emerge >--- crossdev-20101011/wrappers/cross-emerge 2010-10-11 04:52:11.000000000 -0400 >+++ crossdev-20101011-new/wrappers/cross-emerge 2011-09-23 00:16:38.000000000 -0400 >@@ -9,7 +9,7 @@ > fi > export CHOST > >-: ${SYSROOT=/usr/${CHOST}} >+: ${SYSROOT="${EPREFIX}"/usr/${CHOST}} > : ${PORTAGE_CONFIGROOT=${SYSROOT}} > export SYSROOT PORTAGE_CONFIGROOT > >diff -aur crossdev-20101011/wrappers/emerge-wrapper crossdev-20101011-new/wrappers/emerge-wrapper >--- crossdev-20101011/wrappers/emerge-wrapper 2010-10-11 04:52:11.000000000 -0400 >+++ crossdev-20101011-new/wrappers/emerge-wrapper 2011-09-23 02:27:49.000000000 -0400 >@@ -13,7 +13,7 @@ > exit 0 > fi > >-PREFIX="__PREFIX__" >+PREFIX="${EPREFIX}/usr" > # Enable this script to be manually installed while debugging > [[ ${PREFIX} == \_\_\P\R\E\F\I\X\_\_ ]] && PREFIX="/usr" > >@@ -35,7 +35,7 @@ > setup_warning=false > > cp -a "${PREFIX}"/share/crossdev/etc ${SYSROOT}/ || return 1 >- ln -sf /etc/make.globals ${SYSROOT}/etc/make.globals || return 1 >+ ln -sf "${EPREFIX}"/etc/make.globals ${SYSROOT}/etc/make.globals || return 1 > > local conf=${SYSROOT}/etc/make.conf > >@@ -95,7 +95,7 @@ > > cross_wrap() > { >- SYSROOT=/usr/${CHOST} >+ SYSROOT="${EPREFIX}"/usr/${CHOST} > cross_wrap_bin "$@" || return $? > if [[ -d ${SYSROOT} ]] && [[ ! -d ${SYSROOT}/etc ]] ; then > cross_wrap_etc "$@"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 384167
:
287471
|
287473
|
288587
|
296623
|
319886
|
319948
|
354346
|
354352
|
438666