[x264-devel] [PATCH 1/2] Add $SOFLAGS to exported SOFLAGS make variable

[Sean McGovern]

On Mon, May 2, 2011 at 8:31 PM, Sean McGovern <gseanmcg at gmail.com> wrote:

> ---
>  configure |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/configure b/configure
> index ca4f449..1dd255d 100755
> --- a/configure
> +++ b/configure
> @@ -966,25 +966,25 @@ if [ "$shared" = "yes" ]; then
>             echo 'IMPLIBNAME=libx264.dll.lib' >> config.mak
>             # GNU ld on windows defaults to exporting all global functions
> if there are no explicit __declspec(dllexport) declarations
>             # MSVC link does not act similarly, so it is required to make
> an export definition out of x264.h and use it at link time
> -            echo 'SOFLAGS=-dll -def:x264.def -implib:$(IMPLIBNAME)' >>
> config.mak
> +            echo "SOFLAGS=-dll -def:x264.def -implib:\$(IMPLIBNAME)
> $SOFLAGS" >> config.mak
>             echo "EXPORTS" > x264.def
>             grep "^\(int\|void\|x264_t\|extern\).*x264.*[\[(;]" x264.h |
> sed -e "s/.*\(x264.*\)[\[(].*/\1/;s/.*\(x264.*\);/\1/;s/open/open_$API/g" >>
> x264.def
>         else
>             echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
> -            echo 'SOFLAGS=-shared -Wl,--out-implib,$(IMPLIBNAME)
> -Wl,--enable-auto-image-base' >> config.mak
> +            echo "SOFLAGS=-shared -Wl,--out-implib,\$(IMPLIBNAME)
> -Wl,--enable-auto-image-base $SOFLAGS" >> config.mak
>         fi
>     elif [ "$SYS" = "MACOSX" ]; then
>         echo "SOSUFFIX=dylib" >> config.mak
>         echo "SONAME=libx264.$API.dylib" >> config.mak
> -        echo 'SOFLAGS=-shared -dynamiclib -Wl,-single_module
> -Wl,-read_only_relocs,suppress -install_name $(DESTDIR)$(libdir)/$(SONAME)'
> >> config.mak
> +        echo "SOFLAGS=-shared -dynamiclib -Wl,-single_module
> -Wl,-read_only_relocs,suppress -install_name
> \$(DESTDIR)\$(libdir)/\$(SONAME) $SOFLAGS" >> config.mak
>     elif [ "$SYS" = "SunOS" ]; then
>         echo "SOSUFFIX=so" >> config.mak
>         echo "SONAME=libx264.so.$API" >> config.mak
> -        echo 'SOFLAGS=-shared -Wl,-h,$(SONAME)' >> config.mak
> +        echo "SOFLAGS=-shared -Wl,-h,\$(SONAME) $SOFLAGS" >> config.mak
>     else
>         echo "SOSUFFIX=so" >> config.mak
>         echo "SONAME=libx264.so.$API" >> config.mak
> -        echo 'SOFLAGS=-shared -Wl,-soname,$(SONAME)' >> config.mak
> +        echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >>
> config.mak
>     fi
>     echo 'default: $(SONAME)' >> config.mak
>  fi
> --
> 1.7.5
>
> _______________________________________________
> x264-devel mailing list
> x264-devel at videolan.org
> http://mailman.videolan.org/listinfo/x264-devel
>

Ping.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x264-devel/attachments/20110512/cd883024/attachment.html>