commit: c439ad1e97f8d2ddd2d856a1c15cf6f71bb5b245
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 12:56:17 2015 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 12:58:18 2015 +0000
URL: https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=c439ad1e
sys-devel/binutils-config: -5 for RAP.
sys-devel/binutils-config/Manifest | 6 +-
.../binutils-config/binutils-config-1.9-r4.ebuild | 19 -
.../binutils-config/binutils-config-2-r1.ebuild | 19 -
.../binutils-config/binutils-config-3-r3.ebuild | 19 -
sys-devel/binutils-config/binutils-config-5.ebuild | 5 +-
.../binutils-config/files/binutils-config-1.9 | 410 ----------------
sys-devel/binutils-config/files/binutils-config-2 | 434 -----------------
sys-devel/binutils-config/files/binutils-config-3 | 515 ---------------------
sys-devel/binutils-config/files/binutils-config-5 | 71 +--
.../{binutils-config-5 => binutils-config-5.orig} | 0
10 files changed, 47 insertions(+), 1451 deletions(-)
diff --git a/sys-devel/binutils-config/Manifest
b/sys-devel/binutils-config/Manifest
index 39d38f2..532217b 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,10 +1,12 @@
AUX binutils-config-4 11570 SHA256
09ca8e043c07da03ea247bb8cff2777d989f8d435421299de59307c78db1cd8b SHA512
cd987bada67cc222230c3592edf5391caa6c5fcb15081f9acb40befdd351f8a539bde8b9d921cb5c13d6f246b5eecf4fdda9f49bf899f086c966ff6fe558c12e
WHIRLPOOL
e840e7c1137c4598bdd7989f584d18cefa820c86d74d8755718f5aa5e572e79e669cecff23ba6bfc0027110991e5f72c457cb15c910c4bb1e60b8d1e6f660b86
-AUX binutils-config-5 12023 SHA256
261c32814ec804961bb919a53db58618e765784bd646d635455c8ca96c5ed7df SHA512
61d8b1849661ff8424635abc06c14e92cbbe7c8f23ce1d96d0297d3f569ddc5cf52f29aab18be276b70dc85d320b0699c960631dfffc583ba5e232a6731df14f
WHIRLPOOL
cc07c5e9deec78a053d44b79cd714c43815d73e93fbae795335c688bc14cdc71fbc232c9c1b47e2f73f2f0b65e8c0a3a83aec5747d89a52096eab302315dbe4b
+AUX binutils-config-5 12290 SHA256
cc2c12e218d02b5d2bcfdbee27e14d0769a8fbcb0f0d69d2baec65672752debe SHA512
c3334ff4a07a56246abfb32823c098d977c92a849de84a360a7d103c64abd7ed29c4fc03eff029781bd15a01270e63d4b718a7697a99306d1f639e54e3b4ea91
WHIRLPOOL
c5371d7f4e71fcd16e9f7233d7303f08298f599d9fc7059e9e373865b75863f44860b2c6177cd9edb6123b88c32c3048c08f3c930c74f744b776c5fc77715f48
+AUX binutils-config-5.orig 12023 SHA256
261c32814ec804961bb919a53db58618e765784bd646d635455c8ca96c5ed7df SHA512
61d8b1849661ff8424635abc06c14e92cbbe7c8f23ce1d96d0297d3f569ddc5cf52f29aab18be276b70dc85d320b0699c960631dfffc583ba5e232a6731df14f
WHIRLPOOL
cc07c5e9deec78a053d44b79cd714c43815d73e93fbae795335c688bc14cdc71fbc232c9c1b47e2f73f2f0b65e8c0a3a83aec5747d89a52096eab302315dbe4b
AUX binutils-config.8 2837 SHA256
20817cd2e6e3a8ace12ada7b73ada556d597527adcad02876e522e0b6396d4a3 SHA512
66a260499c1100dc71469e4ca1e2b0f71410382138c381e6a6ed4e4aa19520607407ffa6a28e0388e0abe5ee86769b662cec29cdb2ff02cc6c05af64314db5d9
WHIRLPOOL
8bbc5c525b1c7a3ec147458569d570a3312034da2c75c1f31c4cd888db5205aa0a8c8ec061b2354d8ac80b43bdbdf1559a92e904dae5f681345fe758794c2535
AUX binutils.eselect 810 SHA256
e579d3bffc645730f396ebc01d9f9f1043ee8db5edb1f41d5aeadeedcf6aa295 SHA512
105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
WHIRLPOOL
5ae5fd07213e2be381824aea237aa2cc47a987a2ee6508fcd8f18424f8e3de89be71f1de781240af45b98f7525048be2ab7cb60893384efbcde8f8a92a32c73a
EBUILD binutils-config-4-r2.ebuild 589 SHA256
2ed036c4de98c14f8529cda7f20053fc46afa4f2d284a91c6dc2509f09823c5c SHA512
f4b5a3836a3e02a3c27ed30efe365feff8ace91c22fc9b53bce5e434b358067e2f6cdd5229c65df25794a1188327610423a76a216da96ea2a710e6c7c0e39e56
WHIRLPOOL
ea5d882beb17908182762ac0159045b647858dbd73c535babfb82d67d4fd14da3c017e9ba729435ca6317175aaf5de896feecf52ba0e7e76cb47b5c3eeb02223
EBUILD binutils-config-4-r3.ebuild 602 SHA256
15ce445a5ff179785bc453db3284387c9c4131adc49a7ac1552842ed41a6a3f0 SHA512
e53331878b1ac1b9c748ec167965f02769f46a6fae9cc24bed3237c9e593b3eca67b25d49ab8c1d2a8b9cd5bd9aae0b33c445b4c0c3e4e62b05f7594a79af104
WHIRLPOOL
8694df18f030fd023ac79a5df65da7920bbdd4db4f80bba3bc7dbb072b90dcc641d1efca5aaea33b056bd077e3ac2479d027a16a1530884605480b9cd162ee34
EBUILD binutils-config-4-r4.ebuild 704 SHA256
fc57abc3f09896a2f89fa0ed0bf5be6160adf077c3d42d9af274d278f55e3687 SHA512
3df81f0b9d2a8257352239778bc7e153d03e081636eb5772d8e67625308ee2636cd9a1525df07ac44c743e80ccd285d060646e86c5656ace33ec04bbc1cf437b
WHIRLPOOL
fa222755455f5c7e93b592d641f29f7eb700c3158172bd4fc62452c2fdc1fa0fbb7dd08652ce550b1328750f9fc6386ac49a42a21450843c6872e4d4b1a32d5d
-EBUILD binutils-config-5.ebuild 1029 SHA256
9232e53f25ca5c17669b91007767c7ffb70374cfe85cb8702792e07483128011 SHA512
099451164d3704b8025eccb3135ce5988012072e746eaf284589d1371f11df4db7f7c26bd109d1e646cd574b66fbadf83993da77b84c144e9378bb2ea2f256ea
WHIRLPOOL
523ea50fef3c3d5727704b05ad139031b21dd2aeadb5b1fae7a38253514508fb7f5e7ddaac83a25bae3257e36b06932315267528e62a740734b666d5dbc7384d
+EBUILD binutils-config-4.ebuild 694 SHA256
c3d1239293d5b9202bca8ad676589f8fc4765b2f2f020a444013d802205efb5c SHA512
642fc5e12d4f2ff18d9344e43ab8a921230374df8e3c532e01368753053d084ef95fc93bfe5c6dbfdfce6ef8eeed86e3cdcece287ccf4330b0f74581537f2a47
WHIRLPOOL
342d7c82e29142a42bacc90a5a70167b17b339a1957ecd441b866227249009959f0bcdf66ac1fff38b3f0e450e7fc322fe787ecedfb95a2717215785b08a3b63
+EBUILD binutils-config-5.ebuild 1125 SHA256
a1a1cd27a4b811b64bd37dcdd4197100ca70d307552e9c949b64f327cca097d1 SHA512
dfa0b5f117e9ca4e33217bef5f58af2617453812ddff0cf7df7c99f91c1ee817c3bca1f44bd257ff523e2e5f61352c124483fb88bf40bf7dc45fb51fde2e8857
WHIRLPOOL
f461af19822633deeda305750bfae39464acd28b98fbf67db8b2466263b66f32ecb70cb720a0308bcf60ff7091e786905ef7afcf56337417d375d400f179904a
MISC ChangeLog 12757 SHA256
996edd94d7f8b82e690fa028e8e729ba1aafff0e2e8dd2fa358718ee990546df SHA512
bf644ca23b2dcd20d8a7279377711d976211e91bf4c41f10638383dc1a3e2c215864e3328984f50f0d2137474a9d07dcd499eca16a8e2df757f54295a52b5ac3
WHIRLPOOL
5de7f1e57ca53bca17deef27b6a2c52b816d7df586fbbfc92304d8a518a2fd6ef31911f4b2012fb9b8b10210038fcfab05a3871a67545b7f4dfd6eab04c85c4e
MISC metadata.xml 162 SHA256
65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512
2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45
WHIRLPOOL
f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
diff --git a/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild
b/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild
deleted file mode 100644
index 38fbf8f..0000000
--- a/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.9-r4.ebuild,v
1.2 2011/02/06 11:30:43 leio Exp $
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="http://www.gentoo.org/";
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="userland_GNU? ( >=sys-apps/findutils-4.2 )"
-
-src_install() {
- newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
- doman "${FILESDIR}"/${PN}.8
-}
diff --git a/sys-devel/binutils-config/binutils-config-2-r1.ebuild
b/sys-devel/binutils-config/binutils-config-2-r1.ebuild
deleted file mode 100644
index 8edda86..0000000
--- a/sys-devel/binutils-config/binutils-config-2-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-2-r1.ebuild,v
1.7 2011/07/10 23:39:04 halcy0n Exp $
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="http://www.gentoo.org/";
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="userland_GNU? ( >=sys-apps/findutils-4.2 )"
-
-src_install() {
- newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
- doman "${FILESDIR}"/${PN}.8
-}
diff --git a/sys-devel/binutils-config/binutils-config-3-r3.ebuild
b/sys-devel/binutils-config/binutils-config-3-r3.ebuild
deleted file mode 100644
index 7c73deb..0000000
--- a/sys-devel/binutils-config/binutils-config-3-r3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-3-r3.ebuild,v
1.10 2014/01/18 03:08:02 vapier Exp $
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="http://www.gentoo.org/";
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="userland_GNU? ( !<sys-apps/findutils-4.2 )"
-
-src_install() {
- newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
- doman "${FILESDIR}"/${PN}.8
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.ebuild
b/sys-devel/binutils-config/binutils-config-5.ebuild
index f3a4c32..2ae6f8f 100644
--- a/sys-devel/binutils-config/binutils-config-5.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.ebuild
@@ -4,6 +4,7 @@
EAPI="4"
+inherit prefix
DESCRIPTION="Utility to change the binutils version being used"
HOMEPAGE="https://www.gentoo.org/";
SRC_URI=""
@@ -20,7 +21,9 @@ RDEPEND="sys-apps/gentoo-functions
S=${WORKDIR}
src_install() {
- newbin "${FILESDIR}"/${PN}-${PV} ${PN}
+ cp "${FILESDIR}"/${PN}-${PV} "${T}"/ || die "cp failed"
+ eprefixify "${T}"/${PN}-${PV}
+ newbin "${T}"/${PN}-${PV} ${PN}
doman "${FILESDIR}"/${PN}.8
insinto /usr/share/eselect/modules
diff --git a/sys-devel/binutils-config/files/binutils-config-1.9
b/sys-devel/binutils-config/files/binutils-config-1.9
deleted file mode 100755
index f7e03a7..0000000
--- a/sys-devel/binutils-config/files/binutils-config-1.9
+++ /dev/null
@@ -1,410 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v
1.10 2007/05/06 09:04:01 vapier Exp $
-
-# Format of /etc/env.d/binutils/:
-# config-TARGET: CURRENT=version for TARGET
-# TARGET-VER: has a TARGET and VER variable
-
-[[ -z ${ROOT} ]] && ROOT="/"
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
-
-cd /
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-source /etc/init.d/functions.sh || {
- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
- exit 1
-}
-esyslog() { :; }
-umask 022
-
-usage() {
-cat << USAGE_END
-
-Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL}
${BRACKET}[binutils profile]${NORMAL}
-
-${HILITE}General Options:${NORMAL}
- ${GOOD}-c, --get-current-profile${NORMAL} Print current profile
- ${GOOD}-l, --list-profiles${NORMAL} Print a list of available profiles
- ${GOOD}-u, --uninstall${NORMAL} Remove all signs of specified
target
- ${GOOD}-d, --debug${NORMAL} Execute with debug output
-
-${HILITE}Arch Specific Cruft:${NORMAL}
- ${GOOD}--amd64${NORMAL} Install extra amd64 links (x86_64)
- ${GOOD}--arm${NORMAL} Install extra arm links
(arm/armeb)
- ${GOOD}--mips${NORMAL} Install extra mips links
(mips/mipsel)
- ${GOOD}--x86${NORMAL} Install extra x86 links (i[3-6]86)
-
-Profile names are of the form: ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-For example:
${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-
-For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-USAGE_END
-}
-
-switch_profile() {
- unset TARGET VER LIBPATH FAKE_TARGETS
- source "${ENV_D}/${PROFILE}"
- if [[ -z ${TARGET} ]] ; then
- eerror "${PROFILE} is invalid (no \$TARGET defined) :("
- return 1
- fi
- if [[ -z ${VER} ]] ; then
- eerror "${PROFILE} is invalid (no \$VER defined) :("
- return 1
- fi
-
- #
- # Older installs don't have 'FAKE_TARGETS' defined, so lets
- # update these env.d entries so that we don't force the poor
- # user to re-emerge their binutils just for 1 envvar :/
- #
- if [[ ${FAKE_TARGETS-poor user} == "poor user" ]] ; then
- local targ=${TARGET/-*}
- local FAKE_TARGETS=${TARGET}
- case ${targ} in
- mips|powerpc|sparc)
- FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/-/64-}";;
- mips64|powerpc64|sparc64)
- FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/64-/-}";;
- esac
- echo "FAKE_TARGETS=\"${FAKE_TARGETS}\"" >> "${ENV_D}/${PROFILE}"
- fi
- local fake_targ_append="${TARGET#*-}"
- FAKE_TARGETS="${FAKE_TARGETS} ${FAKE_TARGETS_USER//
/-${fake_targ_append} }"
-
- ebegin "Switching to ${PROFILE}"
-
- #
- # Generate binary symlinks
- # On systems that do 32bit/64bit, we need to fake an
- # extra set of binary names (${FAKE_TARGETS})
- #
- BINPATH=""
- BINPATH_LINKS=""
- if [[ ${TARGET} != ${HOST} ]] ; then
- #
- # Newer paths: /usr/${HOST}/${TARGET}/...
- # Older paths: /usr/${TARGET}/...
- #
- if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ;
then
- BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
- fi
- fi
- if [[ -z ${BINPATH} ]] ; then
- BINPATH=/usr/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS=/usr/${TARGET}/bin
- fi
- cd "${ROOT}/${BINPATH}" || exit 1
- mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin"
- for x in * ; do
- ln -sf "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}/${x}"
- ln -sf "${BINPATH_LINKS}/${x}" "${ROOT}"/usr/bin/${TARGET}-${x}
- for fake in ${FAKE_TARGETS} ; do
- [[ -f ${ENV_D}/config-${fake} ]] && continue
- ln -sf "${BINPATH_LINKS}/${x}"
"${ROOT}"/usr/bin/${fake}-${x}
- done
- if [[ ${TARGET} == ${HOST} ]] ; then
- ln -sf ${TARGET}-${x} "${ROOT}"/usr/bin/${x}
- fi
- done
-
- #
- # Generate library / ldscripts symlinks
- #
- LIBPATH=${LIBPATH:-/usr/lib/binutils/${TARGET}/${VER}}
- cd "${ROOT}/${LIBPATH}" || exit 1
- if [[ ${TARGET} == ${HOST} ]] ; then
- dstlib=${ROOT}/usr/${HOST}/lib
- else
- dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
- # Clean out old path
- rm -rf "${ROOT}"/usr/${TARGET}/lib/ldscripts
- rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
- fi
- # When upgrading, we need to clean up ldscripts and libs
- rm -rf "${dstlib}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
- mkdir -p "${dstlib}"
- ln -sf "${LIBPATH}/ldscripts" "${dstlib}"/ldscripts
- find -L "${dstlib}" -type l -exec rm {} \;
- for x in lib* ; do
- ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
- done
-
- #
- # Generate include symlinks
- #
- INCPATH=${LIBPATH}/include
- if [[ -d ${ROOT}/${INCPATH} ]] ; then
- cd "${ROOT}/${INCPATH}" || exit 1
- if [[ ${HOST} == ${TARGET} ]] ; then
- mkdir -p "${ROOT}/usr/include"
- for x in * ; do
- ln -sf "${INCPATH}/${x}"
"${ROOT}/usr/include/${x}"
- done
- else
- # Clean out old path
- find . -type f -exec rm -f
"${ROOT}/usr/${TARGET}/usr/include/{}" \;
- rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
- rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
- rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
- fi
- fi
-
- #
- # Make sure proper paths get updated
- #
- if [[ ${TARGET} == ${HOST} ]] ; then
- DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
- [[ -d ${DATAPATH}/man ]] && \
- echo "MANPATH=${DATAPATH}/man" > "${ROOT}"/etc/env.d/05binutils
- [[ -d ${DATAPATH}/info ]] && \
- echo "INFOPATH=${DATAPATH}/info" >>
"${ROOT}"/etc/env.d/05binutils
- # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
- echo "LDPATH=/usr/${TARGET}/lib" >>
"${ROOT}"/etc/env.d/05binutils
- fi
-
- eend 0
-
- echo "CURRENT=${VER}" > "${ENV_D}/config-${TARGET}"
-
- #
- # Regen env.d if need/can be
- #
- if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
- env-update
- echo
- ewarn "Please remember to run:"
- echo
- ewarn " # source /etc/profile"
- echo
- fi
-
- return 0
-}
-
-uninstall_target() {
- if [[ ${TARGET} == ${HOST} ]] ; then
- eerror "${argv0}: Refusing to uninstall native binutils"
- exit 1
- fi
-
- shopt -s nullglob
- PROFILE=""
-
- for PROFILE in "${ENV_D}"/${TARGET}-* ; do
- ewarn "Removing all signs of ${PROFILE##*/}"
- rm -f "${ENV_D}"/${PROFILE}
- done
- if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
- eerror "${argv0}: No profiles exist for '${TARGET}'"
- exit 1
- fi
-
- rm -f "${ENV_D}"/config-${TARGET}
-
- # XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
- for x in addr2line ar as c++filt elf2flt flthdr gprof ld ld.real \
- nm objcopy objdump ranlib readelf size strings strip ; do
- rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
- rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
- rm -f "${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
- done
- for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
- rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
- done
- for x in bfd iberty opcodes ; do
- rm -f
"${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
- done
- # Delete broken symlinks
- local destdir="${ROOT}/usr/${HOST}/${TARGET}"
- rm -f "${destdir}"/lib/ldscripts
- find -L "${destdir}"/lib -type l -exec rm {} \;
- rmdir "${destdir}"/lib "${destdir}" 2>/dev/null
- rmdir "${destdir}"/{bin,include,lib,usr} "${destdir}" 2>/dev/null
- rmdir "${ROOT}"/var/db/pkg/cross-${TARGET} 2>/dev/null
-
- rm -f "${ENV_D}"/${TARGET}-*
-}
-
-get_current_profile() {
- if [[ ! -f ${ENV_D}/config-${PROFILE} ]] ; then
- eerror "${argv0}: No binutils profile is active!"
- return 1
- fi
-
- source "${ENV_D}/config-${PROFILE}"
-
- if [[ -z ${CURRENT} ]] ; then
- eerror "${argv0}: No binutils profile is active!"
- return 1
- fi
-
- echo "${PROFILE}-${CURRENT}"
-
- return 0
-}
-
-list_profiles() {
- local i=1
-
- set_HOST
-
- if [[ ${ROOT} != / ]] ; then
- echo "Using binutils-config info in ${ROOT}"
- fi
- target=
- for x in "${ENV_D}"/* ; do
- if [[ -f ${x} ]] && [[ ${x/\/config-} == ${x} ]] ; then
- source "${x}"
- if [[ ${target} != ${TARGET} ]] ; then
- [[ -n ${target} ]] && echo
- target=${TARGET}
- fi
-
- x=${x##*/}
- if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
- source "${ENV_D}/config-${TARGET}"
- if [[ ${VER} == ${CURRENT} ]] ; then
- [[ ${TARGET} == ${HOST} ]] \
- && x="${x} ${GOOD}*${NORMAL}" \
- || x="${x} ${HILITE}*${NORMAL}"
- fi
- fi
- echo " [${i}] ${x}"
- ((++i))
- fi
- done
-}
-
-set_HOST() {
- [[ -n ${HOST} ]] && return 0
-
- if [[ -z ${CHOST} ]] ; then
- HOST=$(portageq envvar CHOST)
- else
- HOST=${CHOST}
- fi
-}
-
-ENV_D="${ROOT}etc/env.d/binutils"
-
-DEBUG="no"
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE=""
-FAKE_TARGETS_USER=""
-HOST=""
-
-while [[ $# -gt 0 ]] ; do
- x=$1
- shift
- case ${x} in
- -c|--get-current-profile)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- NEED_ACTION="no"
- DOIT="get_current_profile"
- fi
- ;;
- -d|--debug)
- DEBUG="yes"
- ;;
- -l|--list-profiles)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- NEED_ACTION="no"
- DOIT="list_profiles"
- fi
- ;;
- -u|--uninstall)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- NEED_ACTION="no"
- DOIT="uninstall_target"
- TARGET=$1
- shift
- fi
- ;;
- -h|--help)
- usage
- exit 0
- ;;
- -V|--version)
- cvsver="$Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v
1.10 2007/05/06 09:04:01 vapier Exp $"
- cvsver=${cvsver##*binutils-config-}
- bver=${cvsver%%,v *}
- cvsver=${cvsver#* }
- echo "binutils-config-${bver} (r${cvsver%% *})"
- exit 0
- ;;
- --amd64|--arm|--mips|--x86)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- # Make sure we have a space after each target
- NEED_ACTION="no"
- [[ -z ${PROFILE} ]] && PROFILE="current"
- case ${x} in
- --amd64) FAKE_TARGETS_USER="x86_64 ";;
- --arm) FAKE_TARGETS_USER="arm armeb
";;
- --x86) FAKE_TARGETS_USER="i386 i486
i586 i686 ";;
- --mips) FAKE_TARGETS_USER="mips mips64
mipsel mipsel64 ";;
- esac
- fi
- ;;
- -*)
- eerror "${0##*/}: Invalid switch! Try '--help'."
- exit 1
- ;;
- *)
- if [[ -n ${PROFILE} ]] && [[ ${PROFILE} != "current" ]]
; then
- eerror "${argv0}: Too many arguments! Run
${argv0} without parameters for help."
- exit 1
- fi
-
- if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
- # User gave us a # representing the profile
- i=1
- for y in "${ENV_D}"/* ; do
- [[ ${y/config-} != ${y} ]] && continue
-
- if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]]
; then
- PROFILE=${y##*/}
- NEED_ACTION="no"
- break
- fi
- ((++i))
- done
- fi
-
- if [[ -z ${PROFILE} ]] ; then
- # User gave us a full HOST-ver
- x=${x##*/}
- if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f
${ENV_D}/config-${x} ]] ; then
- # Maybe they just gave us a ver ...
- set_HOST
- if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
- x=${HOST}-${x}
- else
- eerror "${argv0}: Could not
locate '$x' in '${ENV_D}/'!"
- exit 1
- fi
- fi
- PROFILE=${x}
- NEED_ACTION="no"
- fi
- ;;
- esac
-done
-
-[[ ${NEED_ACTION} == "yes" ]] && usage && exit 1
-[[ ${DEBUG} == "yes" ]] && set -x
-
-[[ ${DOIT} != "list_profiles" ]] && set_HOST
-[[ -z ${PROFILE} ]] && PROFILE=${HOST}
-[[ ${PROFILE} == "current" ]] && PROFILE=$(PROFILE=${HOST} get_current_profile)
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/binutils-config-2
b/sys-devel/binutils-config/files/binutils-config-2
deleted file mode 100755
index bbb8f8d..0000000
--- a/sys-devel/binutils-config/files/binutils-config-2
+++ /dev/null
@@ -1,434 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.3
2011/04/03 21:44:42 vapier Exp $
-
-# Format of /etc/env.d/binutils/:
-# config-TARGET: CURRENT=version for TARGET
-# TARGET-VER: has a TARGET and VER variable
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
-
-cd /
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-source /etc/init.d/functions.sh || {
- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
- exit 1
-}
-esyslog() { :; }
-umask 022
-
-usage() {
-cat << USAGE_END
-
-Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL}
${BRACKET}[binutils profile]${NORMAL}
-
-${HILITE}General Options:${NORMAL}
- ${GOOD}-c, --get-current-profile${NORMAL} Print current profile
- ${GOOD}-l, --list-profiles${NORMAL} Print a list of available profiles
- ${GOOD}-u, --uninstall${NORMAL} Remove all signs of specified
target
- ${GOOD}-d, --debug${NORMAL} Execute with debug output
-
-${HILITE}Arch Specific Cruft:${NORMAL}
- ${GOOD}--amd64${NORMAL} Install extra amd64 links (x86_64)
- ${GOOD}--arm${NORMAL} Install extra arm links
(arm/armeb)
- ${GOOD}--mips${NORMAL} Install extra mips links
(mips/mipsel)
- ${GOOD}--x86${NORMAL} Install extra x86 links (i[3-6]86)
-
-Profile names are of the form: ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-For example:
${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-
-For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-USAGE_END
-
- exit ${1:-1}
-}
-
-mv_if_diff() {
- if cmp -s "$1" "$2" ; then
- rm -f "$1"
- else
- mv -f "$1" "$2"
- fi
-}
-
-switch_profile() {
- unset TARGET VER LIBPATH FAKE_TARGETS
- source "${ENV_D}/${PROFILE}"
- if [[ -z ${TARGET} ]] ; then
- eerror "${PROFILE} is invalid (no \$TARGET defined) :("
- return 1
- fi
- if [[ -z ${VER} ]] ; then
- eerror "${PROFILE} is invalid (no \$VER defined) :("
- return 1
- fi
-
- #
- # Older installs don't have 'FAKE_TARGETS' defined, so lets
- # update these env.d entries so that we don't force the poor
- # user to re-emerge their binutils just for 1 envvar :/
- #
- if [[ ${FAKE_TARGETS-poor user} == "poor user" ]] ; then
- local targ=${TARGET/-*}
- local FAKE_TARGETS=${TARGET}
- case ${targ} in
- mips|powerpc|sparc)
- FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/-/64-}";;
- mips64|powerpc64|sparc64)
- FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/64-/-}";;
- esac
- echo "FAKE_TARGETS=\"${FAKE_TARGETS}\"" >> "${ENV_D}/${PROFILE}"
- fi
- local fake_targ_append="${TARGET#*-}"
- FAKE_TARGETS="${FAKE_TARGETS} ${FAKE_TARGETS_USER//
/-${fake_targ_append} }"
-
- ebegin "Switching to ${PROFILE}"
-
- #
- # Generate binary symlinks
- # On systems that do 32bit/64bit, we need to fake an
- # extra set of binary names (${FAKE_TARGETS})
- #
- BINPATH=""
- BINPATH_LINKS=""
- if [[ ${TARGET} != ${HOST} ]] ; then
- #
- # Newer paths: /usr/${HOST}/${TARGET}/...
- # Older paths: /usr/${TARGET}/...
- #
- if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ;
then
- BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
- fi
- fi
- if [[ -z ${BINPATH} ]] ; then
- BINPATH=/usr/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS=/usr/${TARGET}/bin
- fi
- cd "${ROOT}/${BINPATH}" || exit 1
- mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin"
- for x in * ; do
- ln -sf "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}/${x}"
- ln -sf "${BINPATH_LINKS}/${x}" "${ROOT}"/usr/bin/${TARGET}-${x}
- for fake in ${FAKE_TARGETS} ; do
- [[ -f ${ENV_D}/config-${fake} ]] && continue
- ln -sf "${BINPATH_LINKS}/${x}"
"${ROOT}"/usr/bin/${fake}-${x}
- done
- if [[ ${TARGET} == ${HOST} ]] ; then
- ln -sf ${TARGET}-${x} "${ROOT}"/usr/bin/${x}
- fi
- done
-
- #
- # Generate library / ldscripts symlinks
- #
- : ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
- cd "${ROOT}/${LIBPATH}" || exit 1
- if [[ ${TARGET} == ${HOST} ]] ; then
- dstlib=${ROOT}/usr/${HOST}/lib
- else
- dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
- # Clean out old path
- rm -rf "${ROOT}"/usr/${TARGET}/lib/ldscripts
- rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
- fi
- # When upgrading, we need to clean up ldscripts and libs
- rm -rf "${dstlib}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
- mkdir -p "${dstlib}"
- ln -sf "${LIBPATH}/ldscripts" "${dstlib}"/ldscripts
- find -L "${dstlib}" -type l -exec rm {} +
- for x in lib* ; do
- ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
- done
-
- #
- # Generate include symlinks
- #
- INCPATH=${LIBPATH}/include
- if [[ -d ${ROOT}/${INCPATH} ]] ; then
- cd "${ROOT}/${INCPATH}" || exit 1
- if [[ ${HOST} == ${TARGET} ]] ; then
- mkdir -p "${ROOT}/usr/include"
- for x in * ; do
- ln -sf "${INCPATH}/${x}"
"${ROOT}/usr/include/${x}"
- done
- else
- # Clean out old path -- cannot use '-exec {} +' syntax
here
- find . -type f -exec rm -f
"${ROOT}/usr/${TARGET}/usr/include/{}" \;
- rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
- rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
- rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
- fi
- fi
-
- #
- # Make sure proper paths get updated
- #
- if [[ ${TARGET} == ${HOST} ]] ; then
- DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
- local e="${ROOT}"/etc/env.d/05binutils
- local ee="${e}.tmp"
- rm -f "${ee}"
- [[ -d ${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man"
>> "${ee}"
- [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info"
>> "${ee}"
- # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
- if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then
- local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
- local ll="${l}.tmp"
- echo "/usr/${TARGET}/lib" > "${ll}"
- mv_if_diff "${ll}" "${l}"
- else
- echo "LDPATH=/usr/${TARGET}/lib" >> "${ee}"
- fi
- mv_if_diff "${ee}" "${e}"
- fi
-
- local c="${ENV_D}/config-${TARGET}"
- local cc="${c}.tmp"
- echo "CURRENT=${VER}" > "${cc}"
- mv_if_diff "${cc}" "${c}"
-
- eend 0
-
- #
- # Regen env.d if need/can be
- #
- if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
- env-update
- echo
- ewarn "Please remember to run:"
- echo
- ewarn " # . /etc/profile"
- echo
- fi
-
- return 0
-}
-
-uninstall_target() {
- if [[ ${TARGET} == ${HOST} ]] ; then
- eerror "${argv0}: Refusing to uninstall native binutils"
- exit 1
- fi
-
- shopt -s nullglob
- PROFILE=""
-
- for PROFILE in "${ENV_D}"/${TARGET}-* ; do
- ewarn "Removing all signs of ${PROFILE##*/}"
- rm -f "${ENV_D}"/${PROFILE}
- done
- if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
- eerror "${argv0}: No profiles exist for '${TARGET}'"
- exit 1
- fi
-
- rm -f "${ENV_D}"/config-${TARGET}
"${ROOT}"/etc/ld.so.conf.d/05binutils.conf
-
- # XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
- for x in addr2line ar as c++filt elf2flt flthdr gprof ld ld.real \
- nm objcopy objdump ranlib readelf size strings strip ; do
- rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
- rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
- rm -f "${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
- done
- for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
- rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
- done
- for x in bfd iberty opcodes ; do
- rm -f
"${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
- done
- # Delete broken symlinks
- local destdir="${ROOT}/usr/${HOST}/${TARGET}"
- rm -f "${destdir}"/lib/ldscripts
- find -L "${destdir}"/lib -type l -exec rm {} +
- rmdir \
- "${destdir}"/{bin,include,lib,usr} \
- "${destdir}" \
- "${ROOT}"/var/db/pkg/cross-${TARGET} \
- 2>/dev/null
-
- rm -f "${ENV_D}"/${TARGET}-*
-}
-
-get_current_profile() {
- if [[ ! -f ${ENV_D}/config-${PROFILE} ]] ; then
- eerror "${argv0}: No binutils profile is active!"
- return 1
- fi
-
- source "${ENV_D}/config-${PROFILE}"
-
- if [[ -z ${CURRENT} ]] ; then
- eerror "${argv0}: No binutils profile is active!"
- return 1
- fi
-
- echo "${PROFILE}-${CURRENT}"
-
- return 0
-}
-
-list_profiles() {
- local i=1
-
- set_HOST
-
- if [[ ${ROOT} != / ]] ; then
- echo "Using binutils-config info in ${ROOT}"
- fi
- target=
- for x in "${ENV_D}"/* ; do
- if [[ -f ${x} ]] && [[ ${x/\/config-} == ${x} ]] ; then
- source "${x}"
- if [[ ${target} != ${TARGET} ]] ; then
- [[ -n ${target} ]] && echo
- target=${TARGET}
- fi
-
- x=${x##*/}
- if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
- source "${ENV_D}/config-${TARGET}"
- if [[ ${VER} == ${CURRENT} ]] ; then
- [[ ${TARGET} == ${HOST} ]] \
- && x="${x} ${GOOD}*${NORMAL}" \
- || x="${x} ${HILITE}*${NORMAL}"
- fi
- fi
- echo " [${i}] ${x}"
- ((++i))
- fi
- done
-}
-
-set_HOST() {
- [[ -n ${HOST} ]] && return 0
-
- if [[ -z ${CHOST} ]] ; then
- HOST=$(portageq envvar CHOST)
- else
- HOST=${CHOST}
- fi
-}
-
-ENV_D="${ROOT}etc/env.d/binutils"
-
-DEBUG="no"
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE=""
-FAKE_TARGETS_USER=""
-HOST=""
-
-while [[ $# -gt 0 ]] ; do
- x=$1
- shift
- case ${x} in
- -c|--get-current-profile)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- NEED_ACTION="no"
- DOIT="get_current_profile"
- fi
- ;;
- -d|--debug)
- DEBUG="yes"
- ;;
- -l|--list-profiles)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- NEED_ACTION="no"
- DOIT="list_profiles"
- fi
- ;;
- -u|--uninstall)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- NEED_ACTION="no"
- DOIT="uninstall_target"
- TARGET=$1
- shift
- fi
- ;;
- -h|--help)
- usage 0
- ;;
- -V|--version)
- unset Header
- cvsver="$Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-2,v 1.3
2011/04/03 21:44:42 vapier Exp $"
- cvsver=${cvsver##*binutils-config-}
- bver=${cvsver%%,v *}
- cvsver=${cvsver#* }
- echo "binutils-config-${bver} (r${cvsver%% *})"
- exit 0
- ;;
- --amd64|--arm|--mips|--x86)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- # Make sure we have a space after each target
- NEED_ACTION="no"
- [[ -z ${PROFILE} ]] && PROFILE="current"
- case ${x} in
- --amd64) FAKE_TARGETS_USER="x86_64 ";;
- --arm) FAKE_TARGETS_USER="arm armeb
";;
- --x86) FAKE_TARGETS_USER="i386 i486
i586 i686 ";;
- --mips) FAKE_TARGETS_USER="mips mips64
mipsel mipsel64 ";;
- esac
- fi
- ;;
- -*)
- eerror "${0##*/}: Invalid switch! Try '--help'."
- exit 1
- ;;
- *)
- if [[ -n ${PROFILE} ]] && [[ ${PROFILE} != "current" ]]
; then
- eerror "${argv0}: Too many arguments! Run
${argv0} without parameters for help."
- exit 1
- fi
-
- if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
- # User gave us a # representing the profile
- i=1
- for y in "${ENV_D}"/* ; do
- [[ ${y/config-} != ${y} ]] && continue
-
- if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]]
; then
- PROFILE=${y##*/}
- NEED_ACTION="no"
- break
- fi
- ((++i))
- done
- fi
-
- if [[ -z ${PROFILE} ]] ; then
- # User gave us a full HOST-ver
- x=${x##*/}
- if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f
${ENV_D}/config-${x} ]] ; then
- # Maybe they just gave us a ver ...
- set_HOST
- if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
- x=${HOST}-${x}
- else
- eerror "${argv0}: Could not
locate '$x' in '${ENV_D}/'!"
- exit 1
- fi
- fi
- PROFILE=${x}
- NEED_ACTION="no"
- fi
- ;;
- esac
-done
-
-[[ ${NEED_ACTION} == "yes" ]] && usage 1
-[[ ${DEBUG} == "yes" ]] && set -x
-
-[[ ${DOIT} != "list_profiles" ]] && set_HOST
-[[ -z ${PROFILE} ]] && PROFILE=${HOST}
-[[ ${PROFILE} == "current" ]] && PROFILE=$(PROFILE=${HOST} get_current_profile)
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/binutils-config-3
b/sys-devel/binutils-config/files/binutils-config-3
deleted file mode 100644
index 0b4c5ae..0000000
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ /dev/null
@@ -1,515 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v
1.11 2013/05/05 05:20:42 vapier Exp $
-
-# Format of /etc/env.d/binutils/:
-# config-TARGET: CURRENT=version for TARGET
-# TARGET-VER: has a TARGET and VER variable
-
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
- EPREFIX=""
-fi
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
-EROOT="${ROOT%/}${EPREFIX}/"
-
-cd "${EPREFIX}"
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-source "${EPREFIX}"/etc/init.d/functions.sh || {
- echo "${argv0}: Could not source ${EPREFIX}/etc/init.d/functions.sh!"
1>&2
- exit 1
-}
-esyslog() { :; }
-die() { eerror "${argv0}: $*"; exit 1; }
-umask 022
-
-usage() {
-cat << USAGE_END
-Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL}
${BRACKET}[binutils profile]${NORMAL}
-
-${HILITE}General Options:${NORMAL}
- ${GOOD}-c, --get-current-profile${NORMAL} Print current profile
- ${GOOD}-l, --list-profiles${NORMAL} Print a list of available profiles
- ${GOOD}-u, --uninstall${NORMAL} Remove all signs of specified
target
- ${GOOD}-d, --debug${NORMAL} Execute with debug output
-
-${HILITE}General Cruft:${NORMAL}
- ${GOOD}--linker${NORMAL} <linker> Switch to specified linker (if
supported)
-
-${HILITE}Arch Specific Cruft:${NORMAL}
- ${GOOD}--amd64${NORMAL} Install extra amd64 links (x86_64)
- ${GOOD}--arm${NORMAL} Install extra arm links
(arm/armeb)
- ${GOOD}--mips${NORMAL} Install extra mips links
(mips/mipsel)
- ${GOOD}--x86${NORMAL} Install extra x86 links (i[3-6]86)
-
-Profile names are of the form: ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-For example:
${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-
-For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-USAGE_END
-
- exit ${1:-1}
-}
-
-mv_if_diff() {
- if cmp -s "$1" "$2" ; then
- rm -f "$1"
- else
- mv -f "$1" "$2"
- fi
-}
-atomic_ln() {
- local target=$1 linkdir=$2 linkname=$3 linktmp linkfull
- linktmp="${linkdir}/.binutils-config.tmp.${linkname}"
- linkfull="${linkdir}/${linkname}"
- if [[ -d ${linkfull} ]] ; then
- # if linking to a dir, we need a little magic to
- # make it atomic since `mv -T` is not portable
- rm -rf "${linktmp}"
- mkdir -p "${linktmp}"
- ln -sf "${target}" "${linktmp}/${linkname}"
- mv "${linktmp}/${linkname}" "${linktmp}/../"
- rmdir "${linktmp}"
- else
- # `ln` will expand into unlink();symlink(); which
- # is not atomic for a small amount of time, but
- # `mv` is a single rename() call
- ln -sf "${target}" "${linktmp}"
- mv "${linktmp}" "${linkfull}"
- fi
-}
-
-setup_env() {
- unset TARGET VER LIBPATH FAKE_TARGETS
- source "${ENV_D}/${PROFILE}"
- if [[ -z ${TARGET} ]] ; then
- eerror "${PROFILE} is invalid (no \$TARGET defined) :("
- return 1
- fi
- if [[ -z ${VER} ]] ; then
- eerror "${PROFILE} is invalid (no \$VER defined) :("
- return 1
- fi
-
- #
- # Older installs don't have 'FAKE_TARGETS' defined, so lets
- # update these env.d entries so that we don't force the poor
- # user to re-emerge their binutils just for 1 envvar :/
- #
- if [[ ${FAKE_TARGETS-poor user} == "poor user" ]] ; then
- local targ=${TARGET/-*}
- local FAKE_TARGETS=${TARGET}
- case ${targ} in
- mips|powerpc|sparc)
- FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/-/64-}";;
- mips64|powerpc64|sparc64)
- FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/64-/-}";;
- esac
- echo "FAKE_TARGETS=\"${FAKE_TARGETS}\"" >> "${ENV_D}/${PROFILE}"
- fi
- local fake_targ_append="${TARGET#*-}"
- FAKE_TARGETS="${FAKE_TARGETS} ${FAKE_TARGETS_USER//
/-${fake_targ_append} }"
-
- #
- # Generate binary symlinks
- # On systems that do 32bit/64bit, we need to fake an
- # extra set of binary names (${FAKE_TARGETS})
- #
- BINPATH=""
- BINPATH_LINKS=""
- if [[ ${TARGET} != ${HOST} ]] ; then
- #
- # Newer paths: /usr/${HOST}/${TARGET}/...
- # Older paths: /usr/${TARGET}/...
- #
- if [[ -d ${EROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]]
; then
-
BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
- fi
- fi
- if [[ -z ${BINPATH} ]] ; then
- BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
- fi
-}
-
-switch_profile() {
- ebegin "Switching to ${PROFILE}"
-
- setup_env || return 1
-
- cd "${ROOT}/${BINPATH}" || exit 1
- mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
- for x in * ; do
- atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
- atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin/"
"${TARGET}-${x}"
- for fake in ${FAKE_TARGETS} ; do
- [[ -f ${ENV_D}/config-${fake} ]] && continue
- atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin"
"${fake}-${x}"
- done
- if [[ ${TARGET} == ${HOST} ]] ; then
- atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
- fi
- done
-
- #
- # Generate library / ldscripts symlinks
- #
- : ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
- cd "${ROOT}/${LIBPATH}" || exit 1
- if [[ ${TARGET} == ${HOST} ]] ; then
- dstlib=${EROOT}/usr/${HOST}/lib
- else
- dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
- fi
- # When upgrading, we need to clean up ldscripts and libs
- mkdir -p "${dstlib}"
- rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
- atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
- find -L "${dstlib}" -type l -exec rm -v {} +
- for x in lib* ; do
- atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}"
- done
-
- #
- # Generate include symlinks
- #
- INCPATH=${LIBPATH}/include
- if [[ -d ${ROOT}/${INCPATH} ]] ; then
- cd "${ROOT}/${INCPATH}" || exit 1
- if [[ ${HOST} == ${TARGET} ]] ; then
- mkdir -p "${EROOT}/usr/include"
- for x in * ; do
- atomic_ln "${INCPATH}/${x}"
"${EROOT}/usr/include" "${x}"
- done
- else
- # Clean out old path -- cannot use '-exec {} +' syntax
here
- find . -type f -exec rm -f
"${EROOT}/usr/${TARGET}/usr/include/{}" \;
- rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
- rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
- rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
- fi
- fi
-
- #
- # Make sure proper paths get updated
- #
- if [[ ${TARGET} == ${HOST} ]] ; then
- DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
- local e="${EROOT}"/etc/env.d/05binutils
- local ee="${e}.tmp"
- rm -f "${ee}"
- [[ -d ${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man"
>> "${ee}"
- [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info"
>> "${ee}"
- # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
- if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then
- local l="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
- local ll="${l}.tmp"
- echo "/usr/${TARGET}/lib" > "${ll}"
- mv_if_diff "${ll}" "${l}"
- else
- echo "LDPATH=${EPREFIX}/usr/${TARGET}/lib" >> "${ee}"
- fi
- mv_if_diff "${ee}" "${e}"
- fi
-
- local c="${ENV_D}/config-${TARGET}"
- local cc="${c}.tmp"
- echo "CURRENT=${VER}" > "${cc}"
- mv_if_diff "${cc}" "${c}"
-
- eend 0
-
- #
- # Regen env.d if need/can be
- #
- if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
- env-update
- echo
- ewarn "Please remember to run:"
- echo
- ewarn " # . /etc/profile"
- echo
- fi
-
- return 0
-}
-
-uninstall_target() {
- : ${TARGET:=${UARG}}
-
- if [[ ${TARGET} == ${HOST} ]] ; then
- die "refusing to uninstall native binutils"
- fi
-
- shopt -s nullglob
- PROFILE=""
-
- for PROFILE in "${ENV_D}"/${TARGET}-* ; do
- ewarn "Removing all signs of ${PROFILE##*/}"
- rm -f "${ENV_D}"/${PROFILE}
- done
- if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
- die "no profiles exist for '${TARGET}'"
- fi
-
- rm -f "${ENV_D}"/config-${TARGET}
"${EROOT}"/etc/ld.so.conf.d/05binutils.conf
-
- # XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
- local x
- for x in \
- addr2line ar as c++filt elf2flt elfedit flthdr gprof \
- ld ld.{bfd,gold,real} \
- nm objcopy objdump ranlib readelf size strings strip
- do
- x=(
- "${EROOT}"/usr/bin/${TARGET}-${x}
- "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
- "${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
- )
- rm -f "${x[@]}"
- done
- for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
- rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
- done
- for x in bfd iberty opcodes ; do
- rm -f
"${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
- done
- # Delete broken symlinks
- local destdir="${EROOT}/usr/${HOST}/${TARGET}"
- rm -f "${destdir}"/lib/ldscripts
- find -L "${destdir}"/lib -type l -exec rm {} +
- rmdir \
- "${destdir}"/{bin,include,lib,usr} \
- "${destdir}" \
- "${EROOT}"/var/db/pkg/cross-${TARGET} \
- "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
- "${EROOT}"/usr/libexec/gcc/${TARGET} \
- 2>/dev/null
-
- rm -f "${ENV_D}"/${TARGET}-*
-}
-
-set_current_profile() {
- if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then
- eerror "${argv0}: unable to locate a profile for target:
${TARGET}"
- return 1
- fi
-
- source "${ENV_D}/config-${TARGET}"
-
- if [[ -z ${CURRENT} ]] ; then
- eerror "${argv0}: no binutils profile is active!"
- return 1
- fi
-
- echo "${TARGET}-${CURRENT}"
-
- return 0
-}
-get_current_profile() { echo "${PROFILE}" ; }
-
-list_profiles() {
- local x i target
-
- if [[ ${ROOT} != / ]] ; then
- echo "Using binutils-config info in ${ROOT}"
- fi
-
- set -- "${ENV_D}"/*
- target=
- i=1
-
- for x ; do
- # skip broken links and config files
- [[ -f ${x} ]] || continue
- [[ ${x} == */config-* ]] && continue
-
- source "${x}"
- if [[ ${target} != ${TARGET} ]] ; then
- [[ -n ${target} ]] && echo
- target=${TARGET}
- fi
-
- x=${x##*/}
- if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
- source "${ENV_D}/config-${TARGET}"
- if [[ ${VER} == ${CURRENT} ]] ; then
- [[ ${TARGET} == ${HOST} ]] \
- && x="${x} ${GOOD}*${NORMAL}" \
- || x="${x} ${HILITE}*${NORMAL}"
- fi
- fi
-
- # We would align the [...] field like so:
- #printf ' [%*ss] %s\n' ${##} "${i}" "${x}"
- # but this breaks simple scripting: `binutils -l | awk '{print
$2}'`
-
- # Or we could align the target col like so:
- #printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}"
- # but i'm not sold that it looks better
-
- # So keep it simple ... only makes a diff anyways for crazy
people
- # like me which have 100+ binutils packages installed ...
- echo " [$i] ${x}"
- ((++i))
- done
-}
-
-switch_linker() {
- local bpath ld=$1
-
- case ${ld} in
- ld.*) ;;
- *) die "not supported: linker must start with 'ld.'" ;;
- esac
-
- setup_env || return 1
- bpath="${ROOT}/${BINPATH}"
-
- # does this binutils even support the requested linker ?
- if [[ ! -e ${bpath}/${ld} ]] ; then
- die "sorry, but ${PROFILE} doesn't support the ${ld} linker"
- fi
-
- # switch it up
- ebegin "Setting default linker to ${ld} for ${PROFILE}"
- atomic_ln ${ld} "${bpath}" ld
- eend $?
-}
-
-set_HOST() {
- # Set HOST to CHOST if it isn't already set
- : ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
-}
-
-ENV_D="${EROOT}etc/env.d/binutils"
-
-DEBUG="no"
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE="current"
-FAKE_TARGETS_USER=""
-HOST=""
-TARGET=""
-unset UARG
-
-select_action() {
- if [[ ${NEED_ACTION} != "no" ]] ; then
- NEED_ACTION="no"
- DOIT=$1
- else
- die "one action at a time!"
- fi
-}
-
-while [[ $# -gt 0 ]] ; do
- x=$1
- shift
- case ${x} in
- -c|--get-current-profile) select_action get_current_profile ;;
- -l|--list|--list-profiles) select_action list_profiles ;;
- -u|--uninstall) select_action uninstall_target ;;
- --linker) select_action "switch_linker $1";
shift ;;
- -d|--debug) DEBUG="yes" ;;
- -h|--help) usage 0 ;;
- -V|--version)
- unset Header
- cvsver="$Header:
/var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v
1.11 2013/05/05 05:20:42 vapier Exp $"
- cvsver=${cvsver##*binutils-config-}
- bver=${cvsver%%,v *}
- cvsver=${cvsver#* }
- echo "binutils-config-${bver} (r${cvsver%% *})"
- exit 0
- ;;
- --amd64|--arm|--mips|--x86)
- if [[ ${NEED_ACTION} == "yes" ]] ; then
- # Make sure we have a space after each target
- NEED_ACTION="no"
- case ${x} in
- --amd64) FAKE_TARGETS_USER="x86_64 ";;
- --arm) FAKE_TARGETS_USER="arm armeb
";;
- --x86) FAKE_TARGETS_USER="i386 i486
i586 i686 ";;
- --mips) FAKE_TARGETS_USER="mips mips64
mipsel mipsel64 ";;
- esac
- fi
- ;;
- -*)
- die "invalid switch! Try '--help'."
- ;;
- *)
- if [[ ${UARG+set} == "set" ]] ; then
- die "only one profile/target at a time please"
- fi
- NEED_ACTION="maybe"
- UARG=${x}
- ;;
- esac
-done
-
-[[ ${NEED_ACTION} == "yes" ]] && usage 1
-[[ ${DEBUG} == "yes" ]] && set -x
-
-# All operations need to know the current HOST to figure out
-# what is a native target and what is a cross target
-set_HOST
-
-# All operations need to know the profile the user wants
-case ${DOIT} in
-switch_profile|switch_linker_*)
- # decode user's profile choice
- x=${UARG:-$(TARGET=${HOST} set_current_profile)}
- PROFILE=""
- if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
- # User gave us a # representing the profile
- i=1
- for y in "${ENV_D}"/* ; do
- [[ ${y/config-} != ${y} ]] && continue
-
- if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
- PROFILE=${y##*/}
- break
- fi
- ((++i))
- done
- fi
-
- if [[ -z ${PROFILE} ]] ; then
- # User gave us a full HOST-ver
- x=${x##*/}
- if [[ -f ${ENV_D}/${x} ]] ; then
- # Valid HOST-ver yeah!
- PROFILE=${x}
- else
- # Not a valid HOST-ver ...
- if [[ ! -f ${ENV_D}/config-${x} ]] ; then
- # Maybe they just gave us a ver ...
- if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
- x=${HOST}-${x}
- else
- die "could not locate '$x' in
'${ENV_D}/'!"
- fi
- PROFILE=${x}
- else
- # Maybe they just gave us a target ... pick
active profile
- PROFILE=$(TARGET=${x} set_current_profile)
- fi
- fi
- fi
- ;;
-*)
- # lookup current profile as the user gave us a target
- PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1
- ;;
-esac
-
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/binutils-config-5
b/sys-devel/binutils-config/files/binutils-config-5
index 3afc963..b0d8760 100755
--- a/sys-devel/binutils-config/files/binutils-config-5
+++ b/sys-devel/binutils-config/files/binutils-config-5
@@ -7,16 +7,23 @@
# config-TARGET: CURRENT=version for TARGET
# TARGET-VER: has a TARGET and VER variable
+EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
+ EPREFIX=""
+fi
+
: ${ROOT:=/}
[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
-cd /
+EROOT="${ROOT%/}${EPREFIX}/"
+
+cd "${EPREFIX}/"
trap ":" INT QUIT TSTP
argv0=${0##*/}
-FUNCTIONS_SH="/lib/gentoo/functions.sh"
+FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh"
source ${FUNCTIONS_SH} || {
echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2
exit 1
@@ -97,14 +104,14 @@ setup_env() {
# Newer paths: /usr/${HOST}/${TARGET}/...
# Older paths: /usr/${TARGET}/...
#
- if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ;
then
- BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
+ if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
]] ; then
+
BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
+ BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
fi
fi
if [[ -z ${BINPATH} ]] ; then
- BINPATH=/usr/${TARGET}/binutils-bin/${VER}
- BINPATH_LINKS=/usr/${TARGET}/bin
+ BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
+ BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
fi
}
@@ -123,24 +130,24 @@ switch_profile() {
setup_env || return 1
cd "${ROOT}/${BINPATH}" || exit 1
- mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin"
+ mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
for x in * ; do
atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
- atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin"
"${TARGET}-${x}"
+ atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin"
"${TARGET}-${x}"
if [[ ${TARGET} == ${HOST} ]] ; then
- atomic_ln "${TARGET}-${x}" "${ROOT}/usr/bin" "${x}"
+ atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
fi
done
#
# Generate library / ldscripts symlinks
#
- : ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
+ : ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
cd "${ROOT}/${LIBPATH}" || exit 1
if [[ ${TARGET} == ${HOST} ]] ; then
- dstlib=${ROOT}/usr/${HOST}/lib
+ dstlib=${EROOT}/usr/${HOST}/lib
else
- dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
+ dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
fi
# When upgrading, we need to clean up ldscripts and libs.
# Don't symlink back in the libs -- the binutils-lib package handles
@@ -160,17 +167,17 @@ switch_profile() {
if [[ ${HOST} == ${TARGET} ]] ; then
# The binutils-lib package handles these files now.
for x in libiberty "${HEADERS[@]}" ; do
- x="${ROOT}/usr/include/${x}"
+ x="${EROOT}/usr/include/${x}"
if [[ -L ${x} ]] ; then
rm "${x}"
fi
done
else
# Clean out old path -- cannot use '-exec {} +' syntax
here
- find . -type f -exec rm -f
"${ROOT}/usr/${TARGET}/usr/include/{}" \;
- rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
- rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
- rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
+ find . -type f -exec rm -f
"${EROOT}/usr/${TARGET}/usr/include/{}" \;
+ rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
+ rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
+ rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
fi
fi
@@ -183,14 +190,14 @@ switch_profile() {
# Note: This skips ldconfig update if env.d had LDPATH, but meh.
# Most people have upgraded to ld.so.conf.d, and someone else
will
# eventually re-run ldconfig for us.
- x="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
+ x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
if [[ -e ${x} ]]; then
rm -f "${x}"
env_update_flag=""
fi
- DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
- local e="${ROOT}"/etc/env.d/05binutils
+ DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
+ local e="${EROOT}"/etc/env.d/05binutils
local ee="${e}.tmp"
rm -f "${ee}"
[[ -d ${ROOT}/${DATAPATH}/man ]] && echo
"MANPATH=${DATAPATH}/man" >> "${ee}"
@@ -213,7 +220,7 @@ switch_profile() {
echo
ewarn "Please remember to run:"
echo
- ewarn " # . /etc/profile"
+ ewarn " # . ${EPREFIX}/etc/profile"
echo
fi
@@ -247,28 +254,28 @@ uninstall_target() {
nm objcopy objdump ranlib readelf size strings strip
do
x=(
- "${ROOT}"/usr/bin/${TARGET}-${x}
- "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
- "${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
+ "${EROOT}"/usr/bin/${TARGET}-${x}
+ "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
+ "${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
)
rm -f "${x[@]}"
done
for x in "${HEADERS[@]}" ; do
- rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
+ rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
done
for x in bfd iberty opcodes ; do
- rm -f
"${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
+ rm -f
"${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
done
# Delete broken symlinks
- local destdir="${ROOT}/usr/${HOST}/${TARGET}"
+ local destdir="${EROOT}/usr/${HOST}/${TARGET}"
rm -f "${destdir}"/lib/ldscripts
find -L "${destdir}"/lib -type l -exec rm {} +
rmdir \
"${destdir}"/{bin,include,lib,usr} \
"${destdir}" \
- "${ROOT}"/var/db/pkg/cross-${TARGET} \
- "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \
- "${ROOT}"/usr/libexec/gcc/${TARGET} \
+ "${EROOT}"/var/db/pkg/cross-${TARGET} \
+ "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
+ "${EROOT}"/usr/libexec/gcc/${TARGET} \
2>/dev/null
rm -f "${ENV_D}"/${TARGET}-*
@@ -367,7 +374,7 @@ set_HOST() {
: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
}
-ENV_D="${ROOT}etc/env.d/binutils"
+ENV_D="${EROOT}etc/env.d/binutils"
DEBUG="no"
NEED_ACTION="yes"
diff --git a/sys-devel/binutils-config/files/binutils-config-5
b/sys-devel/binutils-config/files/binutils-config-5.orig
similarity index 100%
copy from sys-devel/binutils-config/files/binutils-config-5
copy to sys-devel/binutils-config/files/binutils-config-5.orig
