[FFmpeg-devel] [PATCH] Alternative OS/2 patch

[Diego Biurrun]

On Mon, Dec 03, 2007 at 10:38:02PM -0800, Dave Yeo wrote:
> On 11/27/07 02:34 am, Diego Biurrun wrote:
>> On Mon, Nov 26, 2007 at 06:11:54PM -0800, Dave Yeo wrote:
>>> --- configure	(revision 11093)
>>> +++ configure	(working copy)
>>> @@ -1217,6 +1219,35 @@
>>>          ;;
>>> +    os/2*)
>>> +        SLIB_EXTRA_CMD='emximp -o $(LIBPREF)$(FULLNAME)_dll.a $(FULLNAME).def; emximp -o $(LIBPREF)$(FULLNAME)_dll.lib $(FULLNAME).def'
>>> +        SLIB_INSTALL_EXTRA_CMD='install -m 644 $(LIBPREF)$(FULLNAME)_dll.lib $(LIBPREF)$(FULLNAME)_dll.a "$(LIBDIR)"'
>>> +        SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(FULLNAME)_dll.lib;rm -f "$(LIBDIR)"/$(LIBPREF)$(FULLNAME)_dll.a'
>> nit: Please keep the same order of _dll.lib and _dll.a in the last three
>> lines.
>
> Fixed in attached patch.

No, it is not fixed.

> --- configure	(revision 11160)
> +++ configure	(working copy)
> @@ -1219,6 +1221,35 @@
> +    os/2*)
> +        LIBSUF="_s.lib"
> +        SLIBPREF=""
> +        SLIBSUF=".dll"
> +        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
> +        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'

WTF ?

> +        SLIB_EXTRA_CMD='emximp -o $(LIBPREF)$(NAME)_dll.a $(NAME).def; \
> +          emximp -o $(LIBPREF)$(NAME)_dll.lib $(NAME).def;'
> +        SLIB_INSTALL_EXTRA_CMD='install -m 644 $(LIBPREF)$(NAME)_dll.lib $(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"'
> +        SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib; \
> +          rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a'

This can be done in one rm command.

Diego