[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in sci-biology/phylip: ChangeLog phylip-3.67.ebuild

[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in sci-biology/phylip: ChangeLog phylip-3.67.ebuild

[Donnie Berkholz]

On 18:32 Wed 19 Sep     , Olivier Fisette (ribosome) wrote:
>   Modified:             ChangeLog
>   Added:                phylip-3.67.ebuild
>   Log:
>   New upstream version.
>   (Portage version: 2.1.3.9)
> 

> file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/phylip/ChangeLog?rev=1.27&view=markup
> plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/phylip/ChangeLog?rev=1.27&content-type=text/plain
> diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/phylip/ChangeLog?r1=1.26&r2=1.27

> src_compile() {
> 	sed -e "s/CFLAGS  = -O3 -fomit-frame-pointer/CFLAGS = ${CFLAGS}/" \
> 		-e "s/CC        = cc/CC        = $(tc-getCC)/" \
> 		-e "s/DC        = cc/DC        = $(tc-getCC)/" \
> 		-i Makefile || die "Patching Makefile failed."

This sed is pretty fragile, since it relies on upstream not changing the 
spacing or the default CFLAGS. Better tokens might do something like this:

sed -e "s:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g"

Thanks,
Donnie
-- 
gentoo-dev@gentoo.org mailing list

Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in sci-biology/phylip: ChangeLog phylip-3.67.ebuild

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

On Wednesday 19 September 2007, Donnie Berkholz wrote:
> On 18:32 Wed 19 Sep     , Olivier Fisette (ribosome) wrote:
> >   Modified:             ChangeLog
> >   Added:                phylip-3.67.ebuild
> >   Log:
> >   New upstream version.
> >   (Portage version: 2.1.3.9)
> >
> >
> > file :
> > http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/phylip/Change
> >Log?rev=1.27&view=markup plain:
> > http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/phylip/Change
> >Log?rev=1.27&content-type=text/plain diff :
> > http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/phylip/Change
> >Log?r1=1.26&r2=1.27
> >
> > src_compile() {
> > 	sed -e "s/CFLAGS  = -O3 -fomit-frame-pointer/CFLAGS = ${CFLAGS}/" \
> > 		-e "s/CC        = cc/CC        = $(tc-getCC)/" \
> > 		-e "s/DC        = cc/DC        = $(tc-getCC)/" \
> > 		-i Makefile || die "Patching Makefile failed."
>
> This sed is pretty fragile, since it relies on upstream not changing the
> spacing or the default CFLAGS. Better tokens might do something like this:
>
> sed -e "s:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g"

or do a match/replace and let the env accumulate like normal:
sed -e '/^CFLAGS =/s:=.*:+=:' 
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 827 bytes --]