[oe-commits] Tom Rini : ffmpeg: Pass along all of CCLDs flags, fix !Altivec PowerPC

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 6ed4b0e2b64aecb5155dd6b880407a94f28e0e82
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6ed4b0e2b64aecb5155dd6b880407a94f28e0e82

Author: Tom Rini <tom_rini at mentor.com>
Date:   Wed Sep  8 09:25:21 2010 -0700

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 at mentor.com>

---

 recipes/ffmpeg/ffmpeg.inc    |    2 ++
 recipes/ffmpeg/ffmpeg_0.5.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index be67e61..4352339 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 0c82100..07af21d 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} \
 "