From 36646b355b7890cfd825963d969ddedfc9b9a97d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 1 Mar 2007 21:27:28 +0000 Subject: [PATCH] make sure we look for updated binpath in $ROOT as noted by Diego Package-Manager: portage-2.1.2-r12 --- sys-devel/binutils-config/Manifest | 14 +++++++------- .../binutils-config/files/binutils-config-1.9 | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index 35c570ba8548..4388eb2ffd1c 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -5,10 +5,10 @@ AUX binutils-config-1.8 10258 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 SH MD5 1ee464741f34882a1c46c188af729bc1 files/binutils-config-1.8 10258 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 files/binutils-config-1.8 10258 SHA256 4b39cd5ca2fce451a2abd13e03ed516db21981bb82d15fe29f6a0cb415f07a25 files/binutils-config-1.8 10258 -AUX binutils-config-1.9 11031 RMD160 02de22ff70410c266c95d7beca13b5d8d333dff2 SHA1 30b76eb203aa0590d9ff8e3d818a1114f33b7a72 SHA256 a04591bb040cd689ac0c9001f05aecf58214f61103afc496699f00012d296f9c -MD5 d864bde793dc3080d4b9d87ecbbb9f12 files/binutils-config-1.9 11031 -RMD160 02de22ff70410c266c95d7beca13b5d8d333dff2 files/binutils-config-1.9 11031 -SHA256 a04591bb040cd689ac0c9001f05aecf58214f61103afc496699f00012d296f9c files/binutils-config-1.9 11031 +AUX binutils-config-1.9 11038 RMD160 ffc759b632197592bfb44e370bc4a0a4e57b4343 SHA1 d03fa184563731d80d0b5d52596a141182e353fe SHA256 8cade09fc2bbd387f32a5a181ab26b8df8a8ccd054c684d27f3cbaae7c72fefd +MD5 c57582562fa6365738955fbe96b6cb97 files/binutils-config-1.9 11038 +RMD160 ffc759b632197592bfb44e370bc4a0a4e57b4343 files/binutils-config-1.9 11038 +SHA256 8cade09fc2bbd387f32a5a181ab26b8df8a8ccd054c684d27f3cbaae7c72fefd files/binutils-config-1.9 11038 AUX binutils-config.8 3250 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb SHA1 5ed2e6cd13b5b6a83fd26eec570fd02399495a2a SHA256 8e6dd458d03413ca7907db03413cb7002397ed3a853d1728713eebe5b126ea13 MD5 8b530626d0afc0ca9b0f685a3f640377 files/binutils-config.8 3250 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb files/binutils-config.8 3250 @@ -38,7 +38,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF2xFy8bi6rjpTunYRApsBAKChTP2Z9kGIkFfZWBxE6IDW1ecNsgCdFqLI -lwjsBXz39k34d6Tm1quU+lM= -=Unvm +iD8DBQFF50Wi8bi6rjpTunYRAkh2AKDe6grUUiWG6D/Hp4H10GYaFSeUwgCguprn +2A70ytN2l+iLXk56GHjL5Ck= +=wyWn -----END PGP SIGNATURE----- diff --git a/sys-devel/binutils-config/files/binutils-config-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9 index d77e364a9759..4c65eb653e55 100755 --- a/sys-devel/binutils-config/files/binutils-config-1.9 +++ b/sys-devel/binutils-config/files/binutils-config-1.9 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2007 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.9,v 1.7 2007/02/20 15:18:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.8 2007/03/01 21:27:28 vapier Exp $ # Format of /etc/env.d/binutils/: # config-TARGET: CURRENT=version for TARGET @@ -92,7 +92,7 @@ switch_profile() { # Newer paths: /usr/${HOST}/${TARGET}/... # Older paths: /usr/${TARGET}/... # - if [[ -d /usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then + if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER} BINPATH_LINKS=/usr/libexec/gcc/${TARGET} fi @@ -334,7 +334,7 @@ while [[ $# -gt 0 ]] ; do exit 0 ;; -V|--version) - cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.7 2007/02/20 15:18:16 vapier Exp $" + cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.9,v 1.8 2007/03/01 21:27:28 vapier Exp $" cvsver=${cvsver##*binutils-config-} bver=${cvsver%%,v *} cvsver=${cvsver#* } -- 2.26.2