[FFmpeg-devel] [PATCH] Re-add OS/2 support

[Diego Biurrun]

On Tue, Oct 09, 2007 at 08:03:29PM -0700, Dave Yeo wrote:
> On 10/08/07 06:28 am, Diego Biurrun wrote:
>> On Sun, Oct 07, 2007 at 10:16:26PM -0700, Dave Yeo wrote:
>>> Diego Biurrun wrote:
> ...
>>> updated patch attached
>> Here are some further comments.
>>> --- configure	(revision 10679)
>>> +++ configure	(working copy)
>>> @@ -1210,6 +1212,25 @@
>>>      targetos=irix
>>>      ranlib="echo ignoring ranlib"
>>>      ;;
>>> +  os/2)
>>> +    ln_s="cp -f"
>>> +    LIBSUF="_s.lib"
>>> +    SLIBPREF=""
>>> +    SLIBSUF=".dll"
>>> +    SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
>>> +    SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
>>> +    SLIB_EXTRA_CMD='dllar -o $(SLIBNAME) $(LIB) -d 
>>> $(SLIBNAME_WITH_MAJOR) -omf -ord $(LDFLAGS) $(EXTRALIBS) $(EXTRAOBJS); cp 
>>> -f $(SLIBNAME) $(SLIBNAME_WITH_MAJOR)'
>> The cp -f command is redundant, look at common.mak more closely, it's
>> already there.
>
> Actually the cp -f command in common.mak does cp -f
> $(SLIBNAME_WITH_MAJOR) $(SLIBNAME). To keep make happy we let a bad
> SLIBNAME_WITH_MAJOR get built then replace it with the good DLL that
> dllar.cmd delivers. It is somewhat redundant but made minimal changes to 
> the build system.
>>> +    SLIB_INSTALL_EXTRA_CMD='install -m 644 $(SLIBNAME:$(SLIBSUF)=.lib) 
>>> $(LIBDIR)/$(LIBPREF)$(NAME)_dll.lib; install -m 644 
>>> $(SLIBNAME:$(SLIBSUF)=.a) $(LIBDIR)/$(LIBPREF)$(NAME)_dll.a'
>> $(SLIBNAME:$(SLIBSUF)=.a) could be simplified if you set LIBPREF and
>> used LIB.
>
> No, we're basically doing cp foo.a $LIBDIR/libfoo_dll.a At this point
> LIB is set to libfoo_s.lib and LIBPREF is set to lib already. I did 
> simplify a bit by using NAME.
> I have also seemingly come across a bug (in pdksh or make? anyways some 
> resource leaking) so am making sure cmd.exe invokes dllar.cmd.
> Update patch enclosed including some redundant stuff from other patch I 
> posted.

It's never good to post a patch including redundant stuff from other
patches.  This one does not apply anymore, please resend.

Diego