[FFmpeg-devel] [PATCH] Configure check for bugged make

Stefano Sabatini stefano.sabatini-lala
Thu Oct 23 00:03:09 CEST 2008


On date Wednesday 2008-08-20 10:45:35 +0200, Dominik 'Rathann' Mierzejewski encoded:
> On Wednesday, 20 August 2008 at 09:46, Chris Cormie wrote:
> [...]
> > I've also got a patch for configure that catches the 3.79.1 bug and 
> > warns the developer (below.) Could this be considered for testing and 
> > merging in?
> 
> Cosmetic review below.
> 
> > 
> > Regards,
> > Chris Cormie
> > 
> > Index: configure
> > ===================================================================
> > --- configure	(revision 14784)
> > +++ configure	(working copy)
> > @@ -221,7 +221,7 @@
> >   solving the problem.
> >   EOF
> >       fi
> > -    rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH
> > +    rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH $TMPM
> >       exit 1
> >   }
> > 
> > @@ -592,6 +592,13 @@
> >   EOF
> >   }
> > 
> > +check_make(){
> > +    log check_make "$@"
> > +    cat >$TMPM
> > +    log_file $TMPM
> > +    check_cmd make -f $TMPM
> > +}
> > +
> >   require(){
> >       name="$1"
> >       header="$2"
> > @@ -1124,6 +1131,7 @@
> >   TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
> >   TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
> >   TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
> > +TMPM="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.mak"
> > 
> >   check_cflags -fasm
> >   check_cflags -std=c99
> 
> Vertical align.
> 
> > @@ -1262,6 +1270,7 @@
> >           SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
> >           FFSERVERLDFLAGS=-Wl,-bind_at_load
> >           objformat="macho"
> > +        enabled x86_64 && objformat="macho64"
> >           ;;
> >       mingw32*)
> >           target_os=mingw32
> > @@ -1561,6 +1570,7 @@
> >       enabled_all x86_64 shared && append YASMFLAGS "-DPIC"
> >       case "$objformat" in
> >           elf) enabled debug && append YASMFLAGS "-g dwarf2" ;;
> > +        macho64)              append YASMFLAGS "-DPIC -DPREFIX" ;;
> >           *)                    append YASMFLAGS "-DPREFIX"  ;;
> >       esac
> >       check_yasm "pabsw xmm0, xmm0" && enable yasm
> 
> Stray hunks? Unrelated and already in SVN IIRC.

I'm reviving this patch.

I considered the possibility of checking the version of make, but to
check for the version of a program parsing the --version output is a
braindead solution, furthermore we have to check here for the bugged
behaviour rather than for the version.

I just removed the stray hunk and applied some other cosmetics.

Regards.
-- 
FFmpeg = Faboulous & Fiendish Martial Porno Enlightened Gangster
-------------- next part --------------
A non-text attachment was scrubbed...
Name: check-make-00.patch
Type: text/x-diff
Size: 1585 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20081023/2ce418eb/attachment.patch>



More information about the ffmpeg-devel mailing list