[libav-devel] [PATCH] configure: add strip flags checks

Vittorio Giovara vittorio.giovara at gmail.com
Sat Nov 9 15:51:36 CET 2013


On Sun, Nov 3, 2013 at 11:41 AM, Vittorio Giovara
<vittorio.giovara at gmail.com> wrote:
> This will check if -wN '..@*' is available and fall back on -x if not;
> when none are available, do not run strip at all to prevent removing
> functions that might be actually needed.
> ---
> Removed strip functionality when no flags are available.
> Vittorio
>
>  configure   | 20 ++++++++++++++++++++
>  library.mak |  2 +-
>  2 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 4aa66c0..f78fd54 100755
> --- a/configure
> +++ b/configure
> @@ -659,6 +659,10 @@ add_ldflags(){
>      append LDFLAGS $($ldflags_filter "$@")
>  }
>
> +add_stripflags(){
> +    append STRIPFLAGS "$@"
> +}
> +
>  add_extralibs(){
>      prepend extralibs $($ldflags_filter "$@")
>  }
> @@ -804,6 +808,16 @@ check_ldflags(){
>      test_ldflags "$@" && add_ldflags "$@"
>  }
>
> +test_stripflags(){
> +    log test_stripflags "$@"
> +    check_cmd $strip $STRIPFLAGS "$@" $TMPO
> +}
> +
> +check_stripflags(){
> +    log check_stripflags "$@"
> +    test_stripflags "$@" && add_stripflags "$@"
> +}
> +
>  check_header(){
>      log check_header "$@"
>      header=$1
> @@ -3931,6 +3945,11 @@ check_ldflags -Wl,--warn-common
>  check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
>  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
>
> +# add some strip flags
> +# -wN '..@*' is more selective than -x but not available everywhere
> +# however when both are unavailable do not strip at all
> +check_stripflags -wN '..@*' || check_stripflags -x || strip='true'
> +
>  enabled xmm_clobber_test &&
>      check_ldflags -Wl,--wrap,avcodec_open2              \
>                    -Wl,--wrap,avcodec_decode_audio4      \
> @@ -4206,6 +4225,7 @@ LD_PATH=$LD_PATH
>  DLLTOOL=$dlltool
>  LDFLAGS=$LDFLAGS
>  SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
> +STRIPFLAGS=$STRIPFLAGS
>  YASMFLAGS=$YASMFLAGS
>  BUILDSUF=$build_suffix
>  FULLNAME=$FULLNAME
> diff --git a/library.mak b/library.mak
> index 7292c8a..3876fe3 100644
> --- a/library.mak
> +++ b/library.mak
> @@ -25,7 +25,7 @@ $(SUBDIR)%-test.i: $(SUBDIR)%.c
>  $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
>         $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
>         $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
> -       -$(STRIP) -wN '..@*' $@
> +       -$(STRIP) $(STRIPFLAGS) $@
>
>  LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
>  $(LIBOBJS) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H
> --
> 1.8.4
>

Ping review :)
Vittorio


More information about the libav-devel mailing list