From: Tom Rini <tom_rini@mentor.com>
Date: Wed, 8 Sep 2010 16:25:21 +0000 (-0700)
Subject: ffmpeg: Pass along all of CCLDs flags, fix !Altivec PowerPC
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ed4b0e2b64aecb5155dd6b880407a94f28e0e82;p=openembedded.git

ffmpeg: Pass along all of CCLDs flags, fix !Altivec PowerPC

What's passed for --enable-ldflags is for ffmpeg using cc-as-ld but
not just using CCLD, so pass in TOOLCHAIN_OPTIONS.  For PowerPC,
only pass --enable-altivec on ppce600 (only case of it we support)
otherwise disable as ffmpeg defaults to enabled.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index be67e61250..4352339119 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -32,6 +32,8 @@ EXTRA_OECONF = "\
         \
 "
 
+EXTRA_OECONF_append_powerpc += "--${@['disable-altivec','enable-altivec'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce600']]}"
+
 FFMPEG_LIBS = "libavcodec libavdevice libavformat \
                libavutil libpostproc libswscale libavfilter"
 
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 0c82100318..07af21d04c 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -46,7 +46,7 @@ EXTRA_OECONF = " \
         --arch=${TARGET_ARCH} \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-ldflags="${TARGET_LDFLAGS}" \
+        --extra-ldflags="${TARGET_LDFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --enable-hardcoded-tables \
         ${EXTRA_FFCONF} \
 "