From 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2017 11:17:21 +0000 Subject: gentoo resync : 20.12.2017 --- sys-devel/Manifest.gz | Bin 9326 -> 9313 bytes sys-devel/binutils-config/Manifest | 2 + .../binutils-config/binutils-config-5.1.ebuild | 45 ++ .../binutils-config/files/binutils-config-5.1 | 477 +++++++++++++++++++++ 4 files changed, 524 insertions(+) create mode 100644 sys-devel/binutils-config/binutils-config-5.1.ebuild create mode 100644 sys-devel/binutils-config/files/binutils-config-5.1 (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index ae213e8d006c..936aca72131e 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index b89e5ef1cc49..ce111d1b7b0b 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -1,5 +1,7 @@ AUX binutils-config-5 12363 BLAKE2B f3459aafdb985357fd9aec342453493a06d37de9cbc1e20d3c2f39fb21cb433af836ff1512e18a6237cc69fbe44b3c096288bde82b8f0709f82f695db62c0a85 SHA512 a666b07ab45a54fbf869c1f5bdcb8767b393a4bbaef7dc0e1cbf2a1b70cbb0e9cbf6528617dc90428aa420aa6a6e86eb629738323b80ee77089de75bd885713c +AUX binutils-config-5.1 12166 BLAKE2B a7011cf803455a63deda7c62f3dbb378da1735f17824232394d4e0367edea257482a2b09e2b260fc4263916ef8b07051042162996e4030ae2ebe992f4cf07f35 SHA512 487aefba5f292b32626a1823fb918081f9467bfb21378b0fb8a70c98a9648e32524a6fc0c6e0dd98dd618744ca4e227b1daa7fd71856fe73c1ee10204d9c16e8 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 EBUILD binutils-config-5-r3.ebuild 1128 BLAKE2B 4ef1d4aa6cb85479909bd0c1c77847bec279de43629e468b9ba903e7972ff25039c69621f7d9f2947fb595ced20cdd7af4b1c3f3a56af2c75edeee1c365cecff SHA512 0262239b2c34a14ce7e2e7851715fc917fc4e838bef98ab402c00f9fd8aac7a05db82eae34bd77eb96473f75e313b05dcdbf04b8a900eebb3ddcff35bdb3d528 +EBUILD binutils-config-5.1.ebuild 1169 BLAKE2B dbe4fc38f02aadf96849ba02b35d3adb37e022c6db05d41906c28521c7e9586a1982178ce9f8fd7288fea8fb551adba306ce7e120d83382079e8cc5acab25a3d SHA512 df024b6d226a76ae5322970aa739c1113de4d563c3a82e79e7ebefdcbda4767e6b0e551e4be0025f485b49484bb01d10875e114a95611dc907dbe1ac4d633673 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/sys-devel/binutils-config/binutils-config-5.1.ebuild b/sys-devel/binutils-config/binutils-config-5.1.ebuild new file mode 100644 index 000000000000..ef7b1bd5c11d --- /dev/null +++ b/sys-devel/binutils-config/binutils-config-5.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit prefix + +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 + !&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} Switch to specified linker (if supported) + +Profile names are of the form: ${BRACKET}-${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 "${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 +} + +# 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}" "${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}" + if [[ ${TARGET} == ${HOST} ]] ; then + atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}" + fi + done + + # + # Generate library / ldscripts symlinks + # + : ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}} + cd "${ROOT}/${LIBPATH}" || exit 1 + if [[ ${TARGET} == ${HOST} ]] ; then + dstlib=${EROOT}/usr/${HOST}/lib + elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then + # true for at least avr and msp targets + dstlib=${EROOT}/usr/${TARGET}/lib + else + 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 + # these now. + # TODO: Stop requiring even the ldscripts symlink, except + # we can't for bare-metal toolchains, so... bug #147155 + 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 + # 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 + # + 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="${EROOT}"/etc/ld.so.conf.d/05binutils.conf + if [[ -e ${x} ]]; then + rm -f "${x}" + env_update_flag="" + fi + + 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}" + [[ -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 " # . ${EPREFIX}/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=( + "${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 "${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" +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) + ver="@PV@" + echo "binutils-config-${ver/@'PV'@/git}" + 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 -- cgit v1.2.3