[SCM] libav/experimental: Allow unusual ways of specifying compiler output file

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:48:53 UTC 2013


The following commit has been merged in the experimental branch:
commit 7e6c86e65ddb7cef13f856acf0e10737e10564d3
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Jul 12 13:29:46 2009 +0000

    Allow unusual ways of specifying compiler output file
    
    Some compilers do not use the typical -c -o foo.o style.
    This allows compiler-specific equivalents to be set by the
    configure script.
    
    Originally committed as revision 19409 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index 20d32ed..0d3b0d1 100644
--- a/common.mak
+++ b/common.mak
@@ -21,7 +21,7 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
 
 %.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<
 
 %.o: %.S
 	$(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
diff --git a/configure b/configure
index 8660c40..f3b2ee6 100755
--- a/configure
+++ b/configure
@@ -1263,6 +1263,8 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
 LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
 
+CC_O='-o $@'
+
 host_cflags='-O3 -g -Wall'
 host_libs='-lm'
 
@@ -2493,6 +2495,7 @@ enabled stripping &&
 
 echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
 echo "CFLAGS=$CFLAGS" >> config.mak
+echo "CC_O=$CC_O" >> config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list