Allow users to install fake x86/amd64 symlinks easily and add a manpage.

6 files changed, 440 insertions, 6 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 7b7f6d2020f9..5cf67cc9d8c4 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.9 2005/01/02 03:42:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.10 2005/01/14 03:28:15 vapier Exp $
+
+*binutils-config-1.7 (13 Jan 2005)
+
+  13 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/binutils-config-1.7, +files/binutils-config.8,
+  +binutils-config-1.7.ebuild:
+  Allow users to install fake x86/amd64 symlinks easily and add a manpage.
 
 *binutils-config-1.6 (01 Jan 2005)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 5b92d6e4b551..d8f13721bd03 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4f942db37990035aa40c87e1d7408536 binutils-config-1.6.ebuild 599
-MD5 4d7086c60b2d65a9b47b5d5adbb18926 ChangeLog 1765
+MD5 3854d03b21ac1d62535f32886234070a ChangeLog 2015
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 f29faf5ea949b60f49db01fe57eb0db0 binutils-config-1.7.ebuild 581
+MD5 4f942db37990035aa40c87e1d7408536 binutils-config-1.6.ebuild 599
 MD5 35453667524ba4ee7ae09bee97e27317 files/binutils-config-1.6 7696
+MD5 ee85c5f5c882d34fd4bf9b1910453d40 files/binutils-config-1.7 8652
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.6 0
+MD5 91f671b990b152b98e436bc29127c07b files/binutils-config.8 2335
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB5yw5roRuSHgZdywRAsZHAJ9CKe+aLid2vNHr8Zdsr9RQrbpxbgCdGt3o
-nnHA34HhGbR5TbCwxfdLymM=
-=JpvQ
+iD8DBQFB5zybroRuSHgZdywRAmHFAJ9kq6gcCt9fXzb9bFzltzLJWxg9owCfS6ar
+jZudJstm534Ho0GjdlYYijc=
+=g4HJ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.7.ebuild b/sys-devel/binutils-config/binutils-config-1.7.ebuild
new file mode 100644
index 000000000000..6f46e953ca8d
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-1.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 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.7.ebuild,v 1.1 2005/01/14 03:28:15 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-shells/bash"
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
+	doman "${FILESDIR}"/${PN}.1
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-1.7 b/sys-devel/binutils-config/files/binutils-config-1.7
new file mode 100755
index 000000000000..9f3ef2cdf340
--- /dev/null
+++ b/sys-devel/binutils-config/files/binutils-config-1.7
@@ -0,0 +1,339 @@
+#!/bin/bash
+# Copyright 1999-2004 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.7,v 1.1 2005/01/14 03:28:15 vapier Exp $
+
+# Format of /etc/env.d/binutils/:
+#  config-TARGET:	CURRENT=version for TARGET
+#  TARGET-VER:		has a TARGET and VER variable
+
+trap ":" INT QUIT TSTP
+
+source /etc/init.d/functions.sh || {
+	echo "$0: Could not source /etc/init.d/functions.sh!"
+	exit 1
+}
+umask 022
+
+usage() {
+	cat <<-USAGE_END
+	${HILITE}binutils-config${NORMAL}:
+	  Change the current binutils profile or give info about profiles.
+
+	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
+	
+	${HILITE}Specific Cruft:${NORMAL}
+	  ${GOOD}--x86${NORMAL}                      Install extra x86 links (i[3-6]86)
+	  ${GOOD}--amd64${NORMAL}                    Install extra amd64 links (x86_64)
+	
+	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
+	FAKE_TARGETS="${FAKE_TARGETS} ${FAKE_TARGETS_USER}"
+
+	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=/usr/${TARGET}/binutils-bin/${VER}
+	cd "${ROOT}/${BINPATH}" || exit 1
+	mkdir -p "${ROOT}"/usr/${TARGET}/bin
+	for x in * ; do
+		ln -sf "${BINPATH}/${x}" "${ROOT}"/usr/${TARGET}/bin/${x}
+		ln -sf ../${TARGET}/bin/${x} "${ROOT}"/usr/bin/${TARGET}-${x}
+		for fake in ${FAKE_TARGETS} ; do
+			[[ -f ${ENV_D}/config-${fake} ]] && continue
+			ln -sf ../${TARGET}/bin/${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
+	mkdir -p "${ROOT}"/usr/${TARGET}/lib
+	if [[ -d ${ROOT}/usr/${TARGET}/lib/ldscripts ]] ; then
+		# When upgrading, we need to clean up ldscripts
+		rm -r "${ROOT}"/usr/${TARGET}/lib/ldscripts
+	else
+		rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
+	fi
+	ln -sf "${LIBPATH}/ldscripts" "${ROOT}"/usr/${TARGET}/lib/ldscripts
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		dstlib=${ROOT}/usr/${HOST}/lib
+	else
+		dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
+	fi
+	mkdir -p "${dstlib}"
+	for x in lib* ; do
+		ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
+	done
+
+	#
+	# Generate include symlinks
+	#
+	INCPATH=${LIBPATH}/include
+	cd "${ROOT}/${INCPATH}" || exit 1
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		dstinc=${ROOT}/usr/include
+	else
+		dstinc=${ROOT}/usr/${TARGET}/include
+	fi
+	mkdir -p "${dstinc}"
+	for x in * ; do
+		ln -sf "${INCPATH}/${x}" "${dstinc}/${x}"
+	done
+
+	#
+	# 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
+		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 "$0: 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} ]] ; then
+		eerror "$0: No profiles exist for '${TARGET}'"
+		exit 1
+	fi
+
+	rm -f "${ENV_D}"/config-${TARGET}
+
+	for x in addr2line ar as c++filt ld nm objcopy \
+	         objdump ranlib readelf size strings strip ; do
+		rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
+		rm -f "${ROOT}"/usr/${TARGET}/bin/${x}
+	done
+	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
+		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
+	done
+	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
+}
+
+get_current_profile() {
+	if [[ ! -f ${ENV_D}/config-${PROFILE} ]] ; then
+		eerror "$0: No binutils profile is active!"
+		return 1
+	fi
+
+	source "${ENV_D}/config-${PROFILE}"
+
+	if [[ -z ${CURRENT} ]] ; then
+		eerror "$0: No binutils profile is active!"
+		return 1
+	fi
+
+	echo "${PROFILE}-${CURRENT}"
+
+	return 0
+}
+
+list_profiles() {
+	local i=1
+
+	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}"
+				[[ ${VER} == ${CURRENT} ]] && x="${x} ${GOOD}*${NORMAL}"
+			fi
+			echo " [${i}] ${x}"
+			i=$((i + 1))
+		fi
+	done
+}
+
+[[ -z ${ROOT} ]] && ROOT="/"
+ENV_D="${ROOT}etc/env.d/binutils"
+
+NEED_ACTION="yes"
+DOIT="switch_profile"
+PROFILE=""
+FAKE_TARGETS_USER=""
+
+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
+			;;
+		-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.7,v 1.1 2005/01/14 03:28:15 vapier Exp $"
+			cvsver=${cvsver##*binutils-config-}
+			echo "binutils-config-${cvsver%%,v *}"
+			exit 0
+			;;
+		--x86|--amd64)
+			if [[ ${NEED_ACTION} == "yes" ]] ; then
+				NEED_ACTION="no"
+				PROFILE="current"
+				case ${x} in
+					--x86)   FAKE_TARGETS_USER="i386-pc-linux-gnu i486-pc-linux-gnu i586-pc-linux-gnu i686-pc-linux-gnu";;
+					--amd64) FAKE_TARGETS_USER="x86_64-pc-linux-gnu";;
+				esac
+			fi
+			;;
+		-*)
+			eerror "${0##*/}: Invalid switch!  Try '--help'."
+			exit 1
+			;;
+		*)
+			if [[ -n ${PROFILE} ]] ; then
+				eerror "$0: Too many arguments!  Run $0 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=$((i + 1))
+				done
+			else
+				# User gave us a full HOST-ver
+				x=${x##*/}
+				if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
+					eerror "$0: Could not locate '$x' in '${ENV_D}/'!"
+					exit 1
+				fi
+				PROFILE=${x}
+				NEED_ACTION="no"
+			fi
+			;;
+	esac
+done
+
+[[ ${NEED_ACTION} == "yes" ]] && usage && exit 1
+
+if [[ ${DOIT} != "list_profiles" ]] ; then
+	if [[ -z ${CHOST} ]] ; then
+		HOST=$(portageq envvar CHOST)
+	else
+		HOST=${CHOST}
+	fi
+fi
+[[ -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.8 b/sys-devel/binutils-config/files/binutils-config.8
new file mode 100644
index 000000000000..77626e99bf4a
--- /dev/null
+++ b/sys-devel/binutils-config/files/binutils-config.8
@@ -0,0 +1,65 @@
+.TH "BINUTILS-CONFIG" "8" "Jan 2005" "Gentoo" "Gentoo"
+.SH "NAME"
+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 quickly manage for multiple compiling targets.
+
+You may have 1 version of binutils active per target at a time.  Multiple 
+targets is really only useful for those who wish to cross-compile code.
+.SH "SYNOPSIS"
+.B binutils-config --get-current-profile [TARGET]
+
+.B binutils-config --list-profiles
+
+.B binutils-config --uninstall <TARGET>
+.SH "GENERIC OPTIONS"
+.TP
+\fBTARGET-VERSION\fR
+Update the system to use the \fBTARGET-VERSION\fR of binutils.
+.TP
+\fB\-\-get\-current\-profile\fR (\fB\-c\fR) \fI[TARGET]\fR
+Display the active profile for \fITARGET\fR.  If none is specified, the 
+host system's \fITARGET\fR will be shown.
+.TP
+\fB\-\-list\-profiles\fR (\fB\-l\fR)
+Show all the profiles that your system currently has installed.
+.TP
+\fB\-\-uninstall\fR (\fB-u\fR) <\fBTARGET\fR>
+This is really for internal use only.  Used to remove all traces of the 
+\fBTARGET\fR binutils from your system.
+.SH "SPECIFIC OPTIONS"
+.TP
+\fB\-\-x86\fR
+One oddity of the x86 toolchain is that they may be named 'i386', or 'i486', 
+or 'i586', or 'i686', yet still produce the same exact code.  When dealing 
+with distcc systems that are mixed (some i586 and some i686), you will need 
+symlinks for all these targets.  This option will install those extra targets.
+.TP
+\fB\-\-amd64\fR
+A nice feature of the amd64/x86 toolchain is that each can produce code for 
+other.  The typical user could care less, but some may want to be able to 
+cross-compile for an amd64 on a x86 system.  This will install the extra 
+symlinks ('x86_64') to facilitate this process.
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.SH "SEE ALSO"
+.BR ar (1),
+.BR as (1),
+.BR ld (1),
+.BR nm (1),
+.BR objcopy (1),
+.BR ranlib (1),
+.BR readelf (1),
+.BR strings (1),
+.BR strip (1)
+.SH "FILES"
+.nf
+.BR /usr/bin/binutils-config
+.BR /etc/env.d/binutils/*
+.fi
+.SH "AUTHORS"
+Mike Frysinger <vapier@gentoo.org>
+.SH "CVS HEADER"
+$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config.8,v 1.1 2005/01/14 03:28:15 vapier Exp $
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.7 b/sys-devel/binutils-config/files/digest-binutils-config-1.7
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.7