[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: Error in audio/speex/options.mk
On Sun, Feb 27, 2011 at 08:01:52AM +0000, Thomas Mueller wrote:
> .if !empty(PKG_OPTIONS:Mfftw)
> <<<<<<< options.mk
> #CONFIGURE_ARGS+= --with-fft=fftw3
> . include "../../math/fftw/buildlink3.mk"
> CONFIGURE_ARGS+= --with-fft=gpl-fftw3
> . include "../../math/fftwf/buildlink3.mk"
> >>>>>>> 1.2
> Even putting # at the beginning of these lines was not enough, and I deleted
> offending lines, beginning with <<<<<<< , ======= , and >>>>>>> .
You had local changes in the same part where changes were in the CVS
You can see this when you do 'cvs update' and it says "C" as first
letter for a line. You can look at the changes you have vs. the CVS
with 'cvs diff'.
Main Index |
Thread Index |