[FFmpeg-cvslog] build sys: rename STRIPFLAGS to ASMSTRIPFLAGS

Michael Niedermayer git at videolan.org
Tue Jan 14 01:25:07 CET 2014


ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 28 21:29:13 2013 +0100| [bfdfeadf1154423f6c4556ea759c7a4c618b5bc4] | committer: Michael Niedermayer

build sys: rename STRIPFLAGS to ASMSTRIPFLAGS

This more closely matches the actual use, also we use plain
strip without these flags for striping

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e283c26c35c4f18c8eb2e79183037a883b12d1e5)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfdfeadf1154423f6c4556ea759c7a4c618b5bc4
---

 configure   |    6 +++---
 library.mak |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index d38f117..108b662 100755
--- a/configure
+++ b/configure
@@ -730,7 +730,7 @@ add_ldflags(){
 }
 
 add_stripflags(){
-    append STRIPFLAGS "$@"
+    append ASMSTRIPFLAGS "$@"
 }
 
 add_extralibs(){
@@ -896,7 +896,7 @@ test_stripflags(){
     check_cc <<EOF
 int main(void) { return 0; }
 EOF
-    check_cmd $strip $STRIPFLAGS "$@" $TMPO
+    check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO
 }
 
 check_stripflags(){
@@ -4832,7 +4832,7 @@ LD_PATH=$LD_PATH
 DLLTOOL=$dlltool
 LDFLAGS=$LDFLAGS
 SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
-STRIPFLAGS=$STRIPFLAGS
+ASMSTRIPFLAGS=$ASMSTRIPFLAGS
 YASMFLAGS=$YASMFLAGS
 BUILDSUF=$build_suffix
 PROGSSUF=$progs_suffix
diff --git a/library.mak b/library.mak
index e9128b8..36c883d 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) $(STRIPFLAGS) $@
+	-$(STRIP) $(ASMSTRIPFLAGS) $@
 
 LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
 $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i):   CPPFLAGS += -DHAVE_AV_CONFIG_H



More information about the ffmpeg-cvslog mailing list