* [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-config/files: binutils-config.8 binutils-config-3
@ 2011-08-12 20:26 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2011-08-12 20:26 UTC (permalink / raw
To: gentoo-commits
vapier 11/08/12 20:26:09
Modified: binutils-config.8
Added: binutils-config-3
Log:
Add options to switch the linker on the fly between gold and bfd, and clean up the tangled profile/target logic.
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-devel/binutils-config/files/binutils-config.8
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8?r1=1.3&r2=1.4
Index: binutils-config.8
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- binutils-config.8 17 Feb 2007 18:05:12 -0000 1.3
+++ binutils-config.8 12 Aug 2011 20:26:09 -0000 1.4
@@ -3,28 +3,38 @@
binutils-config \- manage active versions of the binutils programs
.SH "DESCRIPTION"
The \fBbinutils-config\fR script allows you to switch between different
-versions of binutils when you have installed multiple copies via portage.
-It also allows you to manage multiple cross-compiling targets.
+versions of binutils when you have installed multiple copies (see
+USE=multislot). It also allows you to manage multiple cross-compiling
+targets simultaneously.
-Remember, you may have one version of binutils active per \fBCTARGET\fR.
+Remember, you may have one version of binutils active per \fICTARGET\fR,
+and changing the version for one target has no bearing on any other. So
+changing an active cross-compiler will not break your native compiler
+(i.e. \fICHOST\fR).
.SH "SYNOPSIS"
-\fBbinutils-config\fR \fI--get-current-profile\fR \fI[TARGET]\fR
+\fBbinutils-config\fR [\fIcrufty options\fR] \fIPROFILE\fR
-\fBbinutils-config\fR \fI--list-profiles\fR
+\fBbinutils-config\fR \fB--get-current-profile\fR \fI[TARGET]\fR
-\fBbinutils-config\fR \fI--uninstall\fR \fI<TARGET>\fR
+\fBbinutils-config\fR \fB--list-profiles\fR
+
+\fBbinutils-config\fR \fB--uninstall\fR \fITARGET\fR
.SH "GENERIC OPTIONS"
.TP
-\fBTARGET\fR
+\fBPROFILE\fR
Change the system to use the specified binutils version. This may take the
-form of the list index number (the number shown in the
-\fI\-\-list\-profiles\fR output), a full \fBCTARGET-VERSION\fR (useful when
-working with cross-compilers), or just a binutils \fBVERSION\fR where the
-\fBCTARGET\fR is assumed to be the native \fBCHOST\fR value.
+form of the list index number (the number shown on the left in the
+\fB\-\-list\-profiles\fR output), a full \fITARGET-VERSION\fR (useful when
+working with cross-compilers), or just a binutils \fIVERSION\fR where the
+\fITARGET\fR is assumed to be the native \fIHOST\fR value.
+.TP
+\fBTARGET\fR
+Similiar to \fBPROFILE\fR, but this is only the target and no version info
+(i.e. \fICTARGET\fR or \fICHOST\fR).
.TP
\fB\-c\fR, \fB\-\-get\-current\-profile\fR \fI[TARGET]\fR
Display the active profile for \fITARGET\fR. If none is specified, the
-host system's \fITARGET\fR will be shown.
+host system's \fITARGET\fR will be shown (i.e. \fICHOST\fR).
.TP
\fB\-l\fR, \fB\-\-list\-profiles\fR
Show all the profiles that your system currently has installed and what
@@ -32,10 +42,19 @@
asterisk while the active cross-compiler versions are noted with a light blue
asterisk.
.TP
-\fB-u\fR, \fB\-\-uninstall\fR <\fBTARGET\fR>
+\fB-u\fR, \fB\-\-uninstall\fR \fITARGET\fR
This is really for internal use only. Used to remove all traces of the
-\fBTARGET\fR binutils from your system.
-.SH "SPECIFIC OPTIONS"
+\fITARGET\fR binutils from your system.
+.SH "CRUFTY OPTIONS"
+.TP
+\fB\-\-gold\fR
+Change the default linker for the specified \fIPROFILE\fR to the [newer] gold
+linker. This only works if the binutils actually supports gold. Note that
+not all options supported by the bfd linker are supportd by the gold linker.
+.TP
+\fB\-\-bfd\fR
+Change the default linker for the specified \fIPROFILE\fR to the [older but
+stable] bfd linker. If unsure, stick to this one.
.TP
\fB\-\-amd64\fR
A nice feature of the amd64/x86 toolchain is that each can produce code for
1.1 sys-devel/binutils-config/files/binutils-config-3
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3?rev=1.1&content-type=text/plain
Index: binutils-config-3
===================================================================
#!/bin/bash
# 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/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 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}General Cruft:${NORMAL}
${GOOD}--gold${NORMAL} Switch linker to gold (if supported)
${GOOD}--bfd${NORMAL} Switch linker to [older] bfd (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
}
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 ${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
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}-*
}
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 ld=$1
setup_env || return 1
# does this binutils even support the requested linker ?
if [[ ! -e ${BINPATH}/ld.${ld} ]] ; then
eerror "${argv0}: sorry, but ${PROFILE} doesn't support the ${ld} linker"
exit 1
fi
# switch it up
ln -sf ld.${ld} "${BINPATH}"/ld
}
switch_linker_gold() { switch_linker gold ; }
switch_linker_bfd() { switch_linker bfd ; }
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"
FAKE_TARGETS_USER=""
HOST=""
TARGET=""
unset UARG
select_action() {
if [[ ${NEED_ACTION} != "no" ]] ; then
NEED_ACTION="no"
DOIT=$1
else
eerror "${argv0}: one action at a time!"
exit 1
fi
}
while [[ $# -gt 0 ]] ; do
x=$1
shift
case ${x} in
-c|--get-current-profile) select_action get_current_profile ;;
-l|--list-profiles) select_action list_profiles ;;
-u|--uninstall) select_action uninstall_target ;;
--gold) select_action switch_linker_gold ;;
--bfd) select_action switch_linker_bfd ;;
-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.1 2011/08/12 20:26:09 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
;;
-*)
eerror "${0##*/}: Invalid switch! Try '--help'."
exit 1
;;
*)
if [[ ${UARG+set} == "set" ]] ; then
eerror "${argv0}: only one profile/target at a time please"
exit 1
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}
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} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
# Maybe they just gave us a ver ...
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}
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-config/files: binutils-config.8 binutils-config-3
@ 2011-08-12 20:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2011-08-12 20:34 UTC (permalink / raw
To: gentoo-commits
vapier 11/08/12 20:34:00
Modified: binutils-config.8 binutils-config-3
Log:
Add support for profile selection based on the active version of a specified target.
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Revision Changes Path
1.5 sys-devel/binutils-config/files/binutils-config.8
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8?r1=1.4&r2=1.5
Index: binutils-config.8
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- binutils-config.8 12 Aug 2011 20:26:09 -0000 1.4
+++ binutils-config.8 12 Aug 2011 20:34:00 -0000 1.5
@@ -25,7 +25,8 @@
Change the system to use the specified binutils version. This may take the
form of the list index number (the number shown on the left in the
\fB\-\-list\-profiles\fR output), a full \fITARGET-VERSION\fR (useful when
-working with cross-compilers), or just a binutils \fIVERSION\fR where the
+working with cross-compilers), just a \fITARGET\fR where the \fIVERSION\fR
+is picked from the active, or just a binutils \fIVERSION\fR where the
\fITARGET\fR is assumed to be the native \fIHOST\fR value.
.TP
\fBTARGET\fR
1.3 sys-devel/binutils-config/files/binutils-config-3
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3?r1=1.2&r2=1.3
Index: binutils-config-3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- binutils-config-3 12 Aug 2011 20:30:20 -0000 1.2
+++ binutils-config-3 12 Aug 2011 20:34:00 -0000 1.3
@@ -1,7 +1,7 @@
#!/bin/bash
# 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/files/binutils-config-3,v 1.2 2011/08/12 20:30:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.3 2011/08/12 20:34:00 vapier Exp $
# Format of /etc/env.d/binutils/:
# config-TARGET: CURRENT=version for TARGET
@@ -389,7 +389,7 @@
-h|--help) usage 0 ;;
-V|--version)
unset Header
- cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.2 2011/08/12 20:30:20 vapier Exp $"
+ cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.3 2011/08/12 20:34:00 vapier Exp $"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
@@ -461,8 +461,11 @@
eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!"
exit 1
fi
+ PROFILE=${x}
+ else
+ # Maybe they just gave us a target ... pick active profile
+ PROFILE=$(TARGET=${x} set_current_profile)
fi
- PROFILE=${x}
fi
;;
*)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-12 20:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-12 20:26 [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-config/files: binutils-config.8 binutils-config-3 Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-08-12 20:34 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox