summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2014-06-07 14:31:04 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-06-08 14:59:27 +0200
commit5bfdf2aa50e800f45d19f88044c701b74dc1a2ad (patch)
treef55d7c3ce9a1ccb9e67fd9083f5b7989dbaf11b3
parenta1116a3250fdfbd55295ad0f820f6d0c59baccde (diff)
downloadbuildroot-5bfdf2aa50e800f45d19f88044c701b74dc1a2ad.tar.gz
buildroot-5bfdf2aa50e800f45d19f88044c701b74dc1a2ad.zip
xbmc: add host-yasm dependency for MMX/64bit archs
Fixes error during xbmc configure: yasm not found, use --disable-yasm for a crippled build If you think configure made a mistake, make sure you are using the latest version from Git. If the latest version fails, report the problem to the ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.freenode.net. Include the log file "config.log" produced by configure as this will help solving the problem. configure: error: Submodule lib/ffmpeg failed to configure This will be needed for 13.0 Gotham. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/xbmc/xbmc.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 35228026fc..ffe573f29f 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -21,6 +21,13 @@ XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \
# xbmc@i386 depends on nasm
XBMC_DEPENDENCIES += $(if $(BR2_i386),host-nasm)
+# ffmpeg depends on yasm on MMX archs
+# xbmc configure passes $(BR2_ARCH) to ffmpeg configure which adds
+# yasm as dependency for x86_64, even if BR2_x86_generic=y
+ifneq ($(BR2_X86_CPU_HAS_MMX)$(BR2_x86_64),)
+XBMC_DEPENDENCIES += host-yasm
+endif
+
XBMC_CONF_ENV = \
PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \
PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \
OpenPOWER on IntegriCloud