diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-16 19:36:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-16 19:36:27 +0000 |
| commit | 5adbe51d69a1d93f74417857d4c8fd2eae618b8a (patch) | |
| tree | 23272a9752c4235b14f8a5253f5f963ed1a06a6c /sys-devel/gcc-config/files | |
| parent | Force make install -j1; bug 157368 (diff) | |
| download | gentoo-2-5adbe51d69a1d93f74417857d4c8fd2eae618b8a.tar.gz gentoo-2-5adbe51d69a1d93f74417857d4c8fd2eae618b8a.tar.bz2 gentoo-2-5adbe51d69a1d93f74417857d4c8fd2eae618b8a.zip | |
some more tweaks/fixups from Kevin F. Quinn #125805
(Portage version: 2.1.2_rc3)
Diffstat (limited to 'sys-devel/gcc-config/files')
4 files changed, 18 insertions, 7 deletions
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4 index 8b137891791f..e69de29bb2d1 100644 --- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4 +++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r4 @@ -1 +0,0 @@ - diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.14 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.14 index 8b137891791f..e69de29bb2d1 100644 --- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.14 +++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.14 @@ -1 +0,0 @@ - diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.15 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.15 index 8b137891791f..e69de29bb2d1 100644 --- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.15 +++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.15 @@ -1 +0,0 @@ - diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.15 b/sys-devel/gcc-config/files/gcc-config-1.3.15 index 7380a09eefe8..f470948c99d0 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.15 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.15 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.15,v 1.1 2006/12/09 07:33:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.15,v 1.2 2006/12/16 19:36:27 vapier Exp $ trap ":" INT QUIT TSTP @@ -163,13 +163,20 @@ files_exist() { if [[ ${f} == /* ]] ; then [[ ! -f ${f} ]] && ret=1 && break else + # make sure the file exists in at least + # one of the specified paths + ret=1 for p in ${paths} ; do - [[ ! -f ${p}/${f} ]] && ret=1 && break 2 + [[ -f ${p}/${f} ]] && ret=0 && break done + [[ ${ret} == 1 ]] && break fi done export IFS=${old_IFS} + if [[ ${ret} == 1 ]] ; then + ewarn "Could not locate '${f}' in '${paths}'" + fi return ${ret} } @@ -245,8 +252,15 @@ switch_profile() { ${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS)=/ {print $0}' \ "${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc" echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc" - if [[ -n ${GCC_SPECS} ]] && files_exist ${MY_LDPATH} ${GCC_SPECS} ; then - echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc" + if [[ -n ${GCC_SPECS} ]] ; then + if files_exist ${MY_LDPATH} ${GCC_SPECS} ; then + echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc" + else + echo + ewarn "Your GCC spec configurations are broken." + ewarn "Please re-emerge gcc." + echo + fi else # People need to rebuild their gcc or setting GCC_SPECS to # "" will cause issues again :( |