diff options
| author |   Tavis Ormandy <taviso@gentoo.org> | 2003-06-18 08:27:20 +0000 |
|---|---|---|
| committer | Tavis Ormandy <taviso@gentoo.org> | 2003-06-18 08:27:20 +0000 |
| commit | 12854f7cfb4b4c13245602451f74d5f3f76eb690 (patch) | |
| tree | 0b18e7cb402869cd5deaf29238282eb3d656e3d7 /eclass | |
| parent | sfs user has to be part of sfs group (diff) | |
| download | gentoo-2-12854f7cfb4b4c13245602451f74d5f3f76eb690.tar.gz gentoo-2-12854f7cfb4b4c13245602451f74d5f3f76eb690.tar.bz2 gentoo-2-12854f7cfb4b4c13245602451f74d5f3f76eb690.zip | |
regex tweaks
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ccc.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/ccc.eclass b/eclass/ccc.eclass index d0a6023933ee..0e20a1401e5a 100644 --- a/eclass/ccc.eclass +++ b/eclass/ccc.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ccc.eclass,v 1.9 2003/06/16 17:59:09 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ccc.eclass,v 1.10 2003/06/18 08:27:20 taviso Exp $ # # Authors: Tavis Ormandy <taviso@gentoo.org> # Aron Griffis <agriffis@gentoo.org> @@ -8,7 +8,7 @@ # functions to make ebuilds more ccc friendly. # # 16/6/2003 - Added otsify() -# +# 18/6/2003 - regex tweaks. ECLASS=ccc INHERITED="${INHERITED} ${ECLASS}" @@ -148,7 +148,7 @@ replace-cc-hardcode() # Makefiles. Try and fix these. # find ${WORKDIR} -iname Makefile | \ - xargs | ccc-fixup "s#^\(CC.*=\).*g*cc#\1${CC:-gcc}#g" + xargs | ccc-fixup "s#^\(CC.*=\).*g\?cc#\1${CC:-gcc}#g" } replace-cxx-hardcode() @@ -156,7 +156,7 @@ replace-cxx-hardcode() # lots of developers hardcode g++ into thier # Makefiles. Try and fix these. find ${WORKDIR} -iname Makefile | \ - xargs | ccc-fixup "s#^\(CXX.*=\).*[gc]*++#\1${CXX:-g++}#g" + xargs | ccc-fixup "s#^\(CXX.*=\).*[gc]\{1\}++#\1${CXX:-g++}#g" } is-ccc() |