diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-15 20:42:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-15 20:42:13 +0000 |
| commit | 967c717caf5c0747fa01a1c85eefa1c0b0affb91 (patch) | |
| tree | 870437ab4c21705dddb0ebf15dd3aedd0c960fcb /eclass/toolchain.eclass | |
| parent | AUTOTOOLS_IN_SOURCE_BUILD=1 in order to avoid fatal error: colamd.h: No such ... (diff) | |
| download | gentoo-2-967c717caf5c0747fa01a1c85eefa1c0b0affb91.tar.gz gentoo-2-967c717caf5c0747fa01a1c85eefa1c0b0affb91.tar.bz2 gentoo-2-967c717caf5c0747fa01a1c85eefa1c0b0affb91.zip | |
simplify gcc_version_patch slightly
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index bf8bac18f19a..34c4dfc33ad7 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.512 2011/12/15 05:58:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.513 2011/12/15 20:42:13 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1866,20 +1866,18 @@ gcc_version_patch() { tc_version_is_at_least 4.3 && return 0 local version_string=${GCC_CONFIG_VER} - [[ -n ${BRANCH_UPDATE} ]] && version_string="${version_string} ${BRANCH_UPDATE}" + [[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}" einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})" + local gcc_sed=( -e 's:gcc\.gnu\.org/bugs\.html:bugs\.gentoo\.org/:' ) if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then - sed -i -e "s~VERSUFFIX \"\"~VERSUFFIX \" (${BRANDING_GCC_PKGVERSION})\"~" \ - "${S}"/gcc/version.c || die "failed to update VERSUFFIX with Gentoo branding" + gcc_sed+=( -e "/VERSUFFIX \"\"/s:\"\":\" (${BRANDING_GCC_PKGVERSION})\":" ) else version_string="${version_string} (${BRANDING_GCC_PKGVERSION})" - sed -i -e "s~\(const char version_string\[\] = \"\).*\(\".*\)~\1$version_string\2~" \ - "${S}"/gcc/version.c || die "failed to update version.c with Gentoo branding." + gcc_sed+=( -e "/const char version_string\[\] = /s:= \".*\":= \"${version_string}\":" ) fi - sed -i -e 's~gcc\.gnu\.org\/bugs\.html~bugs\.gentoo\.org\/~' \ - "${S}"/gcc/version.c || die "Failed to change the bug URL" + sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die } # This is a historical wart. The original Gentoo/amd64 port used: |