mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '0673ede985a6560e7efb86dab1c58fb7f95ce587'
* commit '0673ede985a6560e7efb86dab1c58fb7f95ce587': configure: add strip flags checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
71b95f2ab6
|
@ -730,6 +730,10 @@ add_ldflags(){
|
||||||
append LDFLAGS $($ldflags_filter "$@")
|
append LDFLAGS $($ldflags_filter "$@")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_stripflags(){
|
||||||
|
append STRIPFLAGS "$@"
|
||||||
|
}
|
||||||
|
|
||||||
add_extralibs(){
|
add_extralibs(){
|
||||||
prepend extralibs $($ldflags_filter "$@")
|
prepend extralibs $($ldflags_filter "$@")
|
||||||
}
|
}
|
||||||
|
@ -892,6 +896,20 @@ check_ldflags(){
|
||||||
test_ldflags "$@" && add_ldflags "$@"
|
test_ldflags "$@" && add_ldflags "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
test_stripflags(){
|
||||||
|
log test_stripflags "$@"
|
||||||
|
# call check_cc to get a fresh TMPO
|
||||||
|
check_cc <<EOF
|
||||||
|
int main(void) { return 0; }
|
||||||
|
EOF
|
||||||
|
check_cmd $strip $STRIPFLAGS "$@" $TMPO
|
||||||
|
}
|
||||||
|
|
||||||
|
check_stripflags(){
|
||||||
|
log check_stripflags "$@"
|
||||||
|
test_stripflags "$@" && add_stripflags "$@"
|
||||||
|
}
|
||||||
|
|
||||||
check_header(){
|
check_header(){
|
||||||
log check_header "$@"
|
log check_header "$@"
|
||||||
header=$1
|
header=$1
|
||||||
|
@ -4507,6 +4525,10 @@ check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:l
|
||||||
enabled rpath && add_ldflags -Wl,-rpath=$libdir
|
enabled rpath && add_ldflags -Wl,-rpath=$libdir
|
||||||
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
|
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
|
||||||
|
|
||||||
|
# add some strip flags
|
||||||
|
# -wN '..@*' is more selective than -x, but not available everywhere.
|
||||||
|
check_stripflags -wN \'..@*\' || check_stripflags -x || strip='true'
|
||||||
|
|
||||||
enabled xmm_clobber_test &&
|
enabled xmm_clobber_test &&
|
||||||
check_ldflags -Wl,--wrap,avcodec_open2 \
|
check_ldflags -Wl,--wrap,avcodec_open2 \
|
||||||
-Wl,--wrap,avcodec_decode_audio4 \
|
-Wl,--wrap,avcodec_decode_audio4 \
|
||||||
|
@ -4858,6 +4880,7 @@ LD_PATH=$LD_PATH
|
||||||
DLLTOOL=$dlltool
|
DLLTOOL=$dlltool
|
||||||
LDFLAGS=$LDFLAGS
|
LDFLAGS=$LDFLAGS
|
||||||
SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
|
SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
|
||||||
|
STRIPFLAGS=$STRIPFLAGS
|
||||||
YASMFLAGS=$YASMFLAGS
|
YASMFLAGS=$YASMFLAGS
|
||||||
BUILDSUF=$build_suffix
|
BUILDSUF=$build_suffix
|
||||||
PROGSSUF=$progs_suffix
|
PROGSSUF=$progs_suffix
|
||||||
|
|
|
@ -25,7 +25,7 @@ $(SUBDIR)%-test.i: $(SUBDIR)%.c
|
||||||
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
|
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
|
||||||
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
|
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
|
||||||
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
|
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
|
||||||
-$(STRIP) -wN '..@*' $@
|
-$(STRIP) $(STRIPFLAGS) $@
|
||||||
|
|
||||||
LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
|
LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
|
||||||
$(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H
|
$(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H
|
||||||
|
|
Loading…
Reference in New Issue