commit: 52559cb5d4e44090725130b6a926dcf40a85ac87 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Mon May 23 10:56:05 2016 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Mon May 23 10:56:05 2016 +0000 URL: https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=52559cb5
sys-devel/binutils-config: clean up. sys-devel/binutils-config/Manifest | 1 + .../binutils-config/binutils-config-4-r2.ebuild | 24 -- .../binutils-config/binutils-config-4-r3.ebuild | 24 -- .../binutils-config/binutils-config-4-r4.ebuild | 28 -- sys-devel/binutils-config/binutils-config-4.ebuild | 24 -- sys-devel/binutils-config/files/binutils-config-4 | 465 -------------------- .../binutils-config/files/binutils-config-5.orig | 479 --------------------- 7 files changed, 1 insertion(+), 1044 deletions(-) diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index 532217b..bdbd34c 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -1,3 +1,4 @@ +AUX binutils-config-2 11440 SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192 SHA512 16b8bc2277bb50fb803377b192368a7abf7c97b5959bdd0d67fcf508220164d29ee2cfc1526ecfce7125b7492a0a5e4f094e948fa5ba9af44487229af3d91197 WHIRLPOOL 3acedb96e6c0c97e2223aa5fffcfb59f7e7b311c883e1557191db14b166a01d14ecd6eafbd4a4dbd33ceb2ca388fa7bf54d8291a24bb5e26a5634e2c8fb2a2df AUX binutils-config-4 11570 SHA256 09ca8e043c07da03ea247bb8cff2777d989f8d435421299de59307c78db1cd8b SHA512 cd987bada67cc222230c3592edf5391caa6c5fcb15081f9acb40befdd351f8a539bde8b9d921cb5c13d6f246b5eecf4fdda9f49bf899f086c966ff6fe558c12e WHIRLPOOL e840e7c1137c4598bdd7989f584d18cefa820c86d74d8755718f5aa5e572e79e669cecff23ba6bfc0027110991e5f72c457cb15c910c4bb1e60b8d1e6f660b86 AUX binutils-config-5 12290 SHA256 cc2c12e218d02b5d2bcfdbee27e14d0769a8fbcb0f0d69d2baec65672752debe SHA512 c3334ff4a07a56246abfb32823c098d977c92a849de84a360a7d103c64abd7ed29c4fc03eff029781bd15a01270e63d4b718a7697a99306d1f639e54e3b4ea91 WHIRLPOOL c5371d7f4e71fcd16e9f7233d7303f08298f599d9fc7059e9e373865b75863f44860b2c6177cd9edb6123b88c32c3048c08f3c930c74f744b776c5fc77715f48 AUX binutils-config-5.orig 12023 SHA256 261c32814ec804961bb919a53db58618e765784bd646d635455c8ca96c5ed7df SHA512 61d8b1849661ff8424635abc06c14e92cbbe7c8f23ce1d96d0297d3f569ddc5cf52f29aab18be276b70dc85d320b0699c960631dfffc583ba5e232a6731df14f WHIRLPOOL cc07c5e9deec78a053d44b79cd714c43815d73e93fbae795335c688bc14cdc71fbc232c9c1b47e2f73f2f0b65e8c0a3a83aec5747d89a52096eab302315dbe4b diff --git a/sys-devel/binutils-config/binutils-config-4-r2.ebuild b/sys-devel/binutils-config/binutils-config-4-r2.ebuild deleted file mode 100644 index ed29997..0000000 --- a/sys-devel/binutils-config/binutils-config-4-r2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="Utility to change the binutils version being used" -HOMEPAGE="https://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="" - -# We also RDEPEND on sys-apps/findutils which is in base @system -RDEPEND="sys-apps/gentoo-functions" - -S=${WORKDIR} - -src_install() { - newbin "${FILESDIR}"/${PN}-${PV} ${PN} - doman "${FILESDIR}"/${PN}.8 -} diff --git a/sys-devel/binutils-config/binutils-config-4-r3.ebuild b/sys-devel/binutils-config/binutils-config-4-r3.ebuild deleted file mode 100644 index 58ade48..0000000 --- a/sys-devel/binutils-config/binutils-config-4-r3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="Utility to change the binutils version being used" -HOMEPAGE="https://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="" - -# We also RDEPEND on sys-apps/findutils which is in base @system -RDEPEND="sys-apps/gentoo-functions" - -S=${WORKDIR} - -src_install() { - newbin "${FILESDIR}"/${PN}-${PV} ${PN} - doman "${FILESDIR}"/${PN}.8 -} diff --git a/sys-devel/binutils-config/binutils-config-4-r4.ebuild b/sys-devel/binutils-config/binutils-config-4-r4.ebuild deleted file mode 100644 index c70e4bb..0000000 --- a/sys-devel/binutils-config/binutils-config-4-r4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -DESCRIPTION="Utility to change the binutils version being used" -HOMEPAGE="https://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="" - -# We also RDEPEND on sys-apps/findutils which is in base @system -RDEPEND="sys-apps/gentoo-functions - !<app-admin/eselect-1.4.5" - -S=${WORKDIR} - -src_install() { - newbin "${FILESDIR}"/${PN}-${PV} ${PN} - doman "${FILESDIR}"/${PN}.8 - - insinto /usr/share/eselect/modules - doins "${FILESDIR}"/binutils.eselect -} diff --git a/sys-devel/binutils-config/binutils-config-4.ebuild b/sys-devel/binutils-config/binutils-config-4.ebuild deleted file mode 100644 index e709158..0000000 --- a/sys-devel/binutils-config/binutils-config-4.ebuild +++ /dev/null @@ -1,24 +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-4.ebuild,v 1.1 2014/07/29 11:15:38 vapier Exp $ - -EAPI="4" - -inherit prefix -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="" - -S=${WORKDIR} - -src_install() { - cp "${FILESDIR}"/${PN}-${PV} "${T}"/ - eprefixify "${T}"/${PN}-${PV} - newbin "${T}"/${PN}-${PV} ${PN} - doman "${FILESDIR}"/${PN}.8 -} diff --git a/sys-devel/binutils-config/files/binutils-config-4 b/sys-devel/binutils-config/files/binutils-config-4 deleted file mode 100644 index 18fc00d..0000000 --- a/sys-devel/binutils-config/files/binutils-config-4 +++ /dev/null @@ -1,465 +0,0 @@ -#!/bin/bash -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# 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##*/} -FUNCTIONS_SH="/lib/gentoo/functions.sh" -source ${FUNCTIONS_SH} || { - echo "${argv0}: Could not source ${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) - -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 - 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 - - # - # Generate binary symlinks - # - 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 -} - -switch_profile() { - ebegin "Switching to ${PROFILE}" - - setup_env || return 1 - - cd "${ROOT}/${BINPATH}" || exit 1 - mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin" - for x in * ; do - atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}" - atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${TARGET}-${x}" - if [[ ${TARGET} == ${HOST} ]] ; then - atomic_ln "${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 - 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 "${ROOT}/usr/include" - for x in * ; do - atomic_ln "${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 ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" - [[ -d ${ROOT}/${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() { - : ${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} - - 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=( - "${ROOT}"/usr/bin/${TARGET}-${x} - "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} - "${ROOT}"/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 "${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} \ - "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \ - "${ROOT}"/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="${ROOT}etc/env.d/binutils" - -DEBUG="no" -NEED_ACTION="yes" -DOIT="switch_profile" -PROFILE="current" -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="$Id$" - cvsver=${cvsver##*binutils-config-} - bver=${cvsver%%,v *} - cvsver=${cvsver#* } - echo "binutils-config-${bver} (r${cvsver%% *})" - exit 0 - ;; - -*) - 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.orig b/sys-devel/binutils-config/files/binutils-config-5.orig deleted file mode 100755 index 3afc963..0000000 --- a/sys-devel/binutils-config/files/binutils-config-5.orig +++ /dev/null @@ -1,479 +0,0 @@ -#!/bin/bash -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# 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##*/} -FUNCTIONS_SH="/lib/gentoo/functions.sh" -source ${FUNCTIONS_SH} || { - echo "${argv0}: Could not source ${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) - -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 - 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 - - # - # Generate binary symlinks - # - 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 -} - -# Lists of headers that various versions have installed. -HEADERS=( - ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h - fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h - splay-tree.h symcat.h -) - -switch_profile() { - local x - - ebegin "Switching to ${PROFILE}" - - setup_env || return 1 - - cd "${ROOT}/${BINPATH}" || exit 1 - mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin" - for x in * ; do - atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}" - atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${TARGET}-${x}" - if [[ ${TARGET} == ${HOST} ]] ; then - atomic_ln "${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 - fi - # When upgrading, we need to clean up ldscripts and libs. - # Don't symlink back in the libs -- the binutils-lib package handles - # these now. - # TODO: Stop requiring even the ldscripts symlink. - mkdir -p "${dstlib}" - rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts - atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" - find -L "${dstlib}" -xtype l -name 'lib*' -exec rm -f {} + - - # - # Clean out old generated include symlinks - # - INCPATH=${LIBPATH}/include - if [[ -d ${ROOT}/${INCPATH} ]] ; then - cd "${ROOT}/${INCPATH}" || exit 1 - if [[ ${HOST} == ${TARGET} ]] ; then - # The binutils-lib package handles these files now. - for x in libiberty "${HEADERS[@]}" ; do - x="${ROOT}/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 - fi - fi - - # - # Make sure proper paths get updated - # - local env_update_flag="--no-ldconfig" - if [[ ${TARGET} == ${HOST} ]] ; then - # Delete old config now that binutils-libs installs these files. - # 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 - 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 - local ee="${e}.tmp" - rm -f "${ee}" - [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" - [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" - 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 ${env_update_flag} - 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} - - 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=( - "${ROOT}"/usr/bin/${TARGET}-${x} - "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} - "${ROOT}"/usr/libexec/gcc/${TARGET}/${x} - ) - rm -f "${x[@]}" - done - for x in "${HEADERS[@]}" ; 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} \ - "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \ - "${ROOT}"/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="${ROOT}etc/env.d/binutils" - -DEBUG="no" -NEED_ACTION="yes" -DOIT="switch_profile" -PROFILE="current" -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="$Id$" - cvsver=${cvsver##*binutils-config-} - bver=${cvsver%%,v *} - cvsver=${cvsver#* } - echo "binutils-config-${bver} (r${cvsver%% *})" - exit 0 - ;; - -*) - 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
