[FFmpeg-devel] [PATCH 2/3] configure: Do not create/install versioned DLLs on OS/2.

[Michael Niedermayer]

On Thu, Apr 14, 2016 at 07:29:26PM -0700, Dave Yeo wrote:
> >From fbff28a5834444cc9fd7144dd4f9dc37b7b5f8aa Mon Sep 17 00:00:00 2001
> From: Dmitriy Kuminov <coding at dmik.org>
> Date: Thu, 14 Apr 2016 01:45:01 +0400
> Subject: [PATCH 2/3] configure: Do not create/install versioned DLLs
> on OS/2.
> 
> Only one DLL for each module must be present on OS/2: SLIBNAME_WITH_MAJOR
> (the same as on Windows). Creating other DLLs makes no sense as they can't
> be used.
> 
> Signed-off-by: Dave Yeo <daveryeo at telus.net>
> ---
>  configure | 23 ++++++++++++-----------
>  1 file changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/configure b/configure
> index ff80aee..36a23f4 100755
> --- a/configure
> +++ b/configure
> @@ -4716,7 +4716,6 @@ case $target_os in
>          ;;
>      os/2*)
>          strip="lxlite -CS"
> -        ln_s="cp -f"
>          objformat="aout"
>          add_cppflags -D_GNU_SOURCE
>          add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
> @@ -4724,16 +4723,18 @@ case $target_os in
>          LIBSUF="_s.a"
>          SLIBPREF=""
>          SLIBSUF=".dll"
> -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
> -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut
> -c1-6)$(LIBMAJOR)$(SLIBSUF)'
> -        SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR)
> INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
> -            echo CODE PRELOAD MOVEABLE DISCARDABLE >>
> $(SUBDIR)$(NAME).def; \
> -            echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >>
> $(SUBDIR)$(NAME).def; \
> -            echo EXPORTS >> $(SUBDIR)$(NAME).def; \

this patch has been corrupted with linebreaks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160415/07588128/attachment.sig>