Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 356280 Details for
Bug 478434
toolchain-binutils.eclass: add prefix support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
toolchain-binutils.patch
toolchain-binutils.patch (text/plain), 4.94 KB, created by
Benda Xu
on 2013-08-17 10:41:41 UTC
(
hide
)
Description:
toolchain-binutils.patch
Filename:
MIME Type:
Creator:
Benda Xu
Created:
2013-08-17 10:41:41 UTC
Size:
4.94 KB
patch
obsolete
>Index: tauon/toolchain-binutils.eclass >=================================================================== >--- tauon.orig/toolchain-binutils.eclass 2013-07-29 14:18:31.000000000 +0900 >+++ tauon/toolchain-binutils.eclass 2013-08-12 17:10:36.000000000 +0900 >@@ -264,5 +266,5 @@ > [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) >- is_cross && myconf+=( --with-sysroot=/usr/${CTARGET} ) >+ is_cross && myconf+=( --with-sysroot="${EPREFIX}"/usr/${CTARGET} ) > > # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ > # on everyone in alpha (for now), we'll just enable it when possible >@@ -270,16 +272,16 @@ > has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) > > myconf+=( >- --prefix=/usr >+ --prefix="${EPREFIX}"/usr > --host=${CHOST} > --target=${CTARGET} >- --datadir=${DATAPATH} >- --infodir=${DATAPATH}/info >- --mandir=${DATAPATH}/man >- --bindir=${BINPATH} >- --libdir=${LIBPATH} >- --libexecdir=${LIBPATH} >- --includedir=${INCPATH} >+ --datadir="${EPREFIX}"${DATAPATH} >+ --infodir="${EPREFIX}"${DATAPATH}/info >+ --mandir="${EPREFIX}"${DATAPATH}/man >+ --bindir="${EPREFIX}"${BINPATH} >+ --libdir="${EPREFIX}"${LIBPATH} >+ --libexecdir="${EPREFIX}"${LIBPATH} >+ --includedir="${EPREFIX}"${INCPATH} > --enable-obsolete > --enable-shared > --enable-threads >@@ -317,7 +319,7 @@ > --with-bfd-include-dir=${MY_BUILDDIR}/bfd > --with-libbfd=${MY_BUILDDIR}/bfd/libbfd.a > --with-libiberty=${MY_BUILDDIR}/libiberty/libiberty.a >- --with-binutils-ldscript-dir=${LIBPATH}/ldscripts >+ --with-binutils-ldscript-dir="${EPREFIX}"${LIBPATH}/ldscripts > ) > echo ./configure "${myconf[@]}" > ./configure "${myconf[@]}" || die >@@ -335,12 +337,12 @@ > local x d > > cd "${MY_BUILDDIR}" >- emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die >- rm -rf "${D}"/${LIBPATH}/bin >- use static-libs || find "${D}" -name '*.la' -delete >+ emake DESTDIR="${D}" tooldir="${EPREFIX}/${LIBPATH}" install || die >+ rm -rf "${ED}"/${LIBPATH}/bin >+ use static-libs || find "${ED}" -name '*.la' -delete > > # Newer versions of binutils get fancy with ${LIBPATH} #171905 >- cd "${D}"/${LIBPATH} >+ cd "${ED}"/${LIBPATH} > for d in ../* ; do > [[ ${d} == ../${BVER} ]] && continue > mv ${d}/* . || die >@@ -351,15 +353,15 @@ > # When something is built to cross-compile, it installs into > # /usr/$CHOST/ by default ... we have to 'fix' that :) > if is_cross ; then >- cd "${D}"/${BINPATH} >+ cd "${ED}"/${BINPATH} > for x in * ; do > mv ${x} ${x/${CTARGET}-} > done > >- if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then >- mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH} >- mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/ >- rm -r "${D}"/usr/${CHOST}/{include,lib} >+ if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then >+ mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} >+ mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ >+ rm -r "${ED}"/usr/${CHOST}/{include,lib} > fi > fi > insinto ${INCPATH} >@@ -374,9 +376,9 @@ > splay-tree.h > ) > doins "${libiberty_headers[@]/#/${S}/include/}" || die >- if [[ -d ${D}/${LIBPATH}/lib ]] ; then >- mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/ >- rm -r "${D}"/${LIBPATH}/lib >+ if [[ -d ${ED}/${LIBPATH}/lib ]] ; then >+ mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ >+ rm -r "${ED}"/${LIBPATH}/lib > fi > > # Insert elf2flt where appropriate >@@ -386,7 +388,7 @@ > doins elf2flt.ld || die "doins elf2flt.ld failed" > exeinto ${BINPATH} > doexe elf2flt flthdr || die "doexe elf2flt flthdr failed" >- mv "${D}"/${BINPATH}/{ld,ld.real} || die >+ mv "${ED}"/${BINPATH}/{ld,ld.real} || die > newexe ld-elf2flt ld || die "doexe ld-elf2flt failed" > newdoc README README.elf2flt > fi >@@ -416,7 +418,7 @@ > cat <<-EOF > env.d > TARGET="${CTARGET}" > VER="${BVER}" >- LIBPATH="${LIBPATH}" >+ LIBPATH="${EPREFIX}/${LIBPATH}" > FAKE_TARGETS="${FAKE_TARGETS}" > EOF > newins env.d ${CTARGET}-${BVER} >@@ -441,14 +443,14 @@ > dodoc opcodes/ChangeLog* > fi > # Remove shared info pages >- rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info} >+ rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} > # Trim all empty dirs >- find "${D}" -type d | xargs rmdir >& /dev/null >+ find "${ED}" -type d | xargs rmdir >& /dev/null > } > > toolchain-binutils_pkg_postinst() { > # Make sure this ${CTARGET} has a binutils version selected >- [[ -e ${ROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 >+ [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 > binutils-config ${CTARGET}-${BVER} > } > >@@ -461,7 +463,7 @@ > # rerun binutils-config if this is a remerge, as > # we want the mtimes on the symlinks updated (if > # it is the same as the current selected profile) >- if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then >+ if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then > local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') > choice=${choice//$'\n'/ } > choice=${choice/* }
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 478434
:
354380
|
355742
|
356280
|
359724