New version to support extra symlink generation for multilib systems.
authorMike Frysinger <vapier@gentoo.org>
Thu, 30 Dec 2004 22:18:54 +0000 (22:18 +0000)
committerMike Frysinger <vapier@gentoo.org>
Thu, 30 Dec 2004 22:18:54 +0000 (22:18 +0000)
sys-devel/binutils-config/ChangeLog
sys-devel/binutils-config/Manifest
sys-devel/binutils-config/binutils-config-1.5.ebuild [new file with mode: 0644]
sys-devel/binutils-config/files/binutils-config-1.5 [new file with mode: 0755]
sys-devel/binutils-config/files/digest-binutils-config-1.5 [new file with mode: 0644]

index 21cd3969c9224f75f591d203b047848e7a0ec1dc..a324dec74690d930d288baff90267ef6dadbb274 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.5 2004/12/26 08:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.6 2004/12/30 22:18:54 vapier Exp $
+
+*binutils-config-1.5 (30 Dec 2004)
+
+  30 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/binutils-config-1.5, +binutils-config-1.5.ebuild:
+  New version to support extra symlink generation for multilib systems.
 
 *binutils-config-1.4 (26 Dec 2004)
 
index 1041ccb0071c1963a97ae1559d4b82257fd0109b..0cf8d959b4febed9255e438a9aa69efb2fd3bf69 100644 (file)
@@ -1,10 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1e278e45901fb13d42e874c3262f34c2 ChangeLog 1194
+MD5 49a247840f0a18838720a65c7750a226 binutils-config-1.5.ebuild 599
+MD5 dcc35454743584a3800981318a55cf5f ChangeLog 1412
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 13cac863aa2be230b24efa45d6eec904 binutils-config-1.3.ebuild 599
 MD5 bd539973a95279630df011bdfe24f552 binutils-config-1.4.ebuild 599
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.5 0
+MD5 b0fe4c1f83d9bf68263d9fe26e41bc65 files/binutils-config-1.5 6840
 MD5 194c77e52d3e896888220e8ccd985ae1 files/binutils-config-1.3 6057
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.3 0
 MD5 1166a8d4a5379f21f219178f9a6176cc files/binutils-config-1.4 6605
@@ -12,7 +15,7 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.4 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBznbjroRuSHgZdywRAmBYAJ0TK+PHI4kw4qOCUu+oDjS8XhnHmwCeLhII
-+2IdsDBnqq3P71WnIcD21qY=
-=ND0b
+iD8DBQFB1H7XroRuSHgZdywRAq4pAJ0Q+C+dgbkiu+/hlYV5q8Yr8xvemQCfRYfv
+FccqKt+gYpsmknrBDfuosK0=
+=qZiA
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.5.ebuild b/sys-devel/binutils-config/binutils-config-1.5.ebuild
new file mode 100644 (file)
index 0000000..77602ea
--- /dev/null
@@ -0,0 +1,19 @@
+# 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/binutils-config-1.5.ebuild,v 1.1 2004/12/30 22:18:54 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
+       dosed "s:PORTAGE-VERSION:${PV}:" /usr/bin/${PN}
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-1.5 b/sys-devel/binutils-config/files/binutils-config-1.5
new file mode 100755 (executable)
index 0000000..f07a027
--- /dev/null
@@ -0,0 +1,295 @@
+#!/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.5,v 1.1 2004/12/30 22:18:54 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"
+Usage: binutils-config [options] [binutils profile]
+Change the current binutils profile, or give info about profiles.
+
+Options:
+  -c, --get-current-profile  Print current profile
+  -l, --list-profiles        Print a list of available profiles
+  -u, --uninstall            Remove all signs of specified target
+
+Profile names are of the form:  <CHOST>-<binutils version>
+For example:                    x86_64-pc-linux-gnu-2.15.92.0.2
+USAGE_END
+}
+
+[[ $# -lt 1 ]] && usage && exit 1
+
+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
+
+       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}
+               if [[ ${TARGET} = "${HOST}" ]] ; then
+                       ln -sf ${TARGET}-${x} "${ROOT}"/usr/bin/${x}
+
+                       for fake in ${FAKE_TARGETS} ; do
+                               ln -sf ../${TARGET}/bin/${x} "${ROOT}"/usr/bin/${fake}-${x}
+                       done
+               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}"
+               echo "MANPATH=${DATAPATH}/man" > "${ROOT}"/etc/env.d/05binutils
+               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} *"
+                       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=""
+
+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)
+                       echo "binutils-config-1.0"
+                       exit 0
+                       ;;
+               -*)
+                       eerror "$0: Invalid switch!  Run $0 without parameters for 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##*/}"
+                                               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}"
+                       fi
+                       ;;
+       esac
+done
+
+if [[ ${DOIT} != "list_profiles" ]] ; then
+       if [[ -z ${CHOST} ]] ; then
+               HOST="$(portageq envvar CHOST)"
+       else
+               HOST="${CHOST}"
+       fi
+fi
+[ -z "${PROFILE}" ] && PROFILE="${HOST}"
+eval ${DOIT}
+
+# vim:ts=4
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.5 b/sys-devel/binutils-config/files/digest-binutils-config-1.5
new file mode 100644 (file)
index 0000000..e69de29