From: Peter Korsgaard <peter@korsgaard.com>
Date: Sat, 31 Jan 2015 07:18:30 +0000 (+0100)
Subject: ffmpeg: disable freetype support on microblaze/glibc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64a49804fb3b89e99c8b7840aebd66ff07f5f54c;p=buildroot.git

ffmpeg: disable freetype support on microblaze/glibc

Fixes http://autobuild.buildroot.net/results/6dd/6ddefaf001b9275ee073effbd6eb07be9f43e24d/

While it does provide fenv.h, it doesn't support the needed exceptions so
disable it.

Reported-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 16f53be699..f9c1d94820 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -234,8 +234,9 @@ FFMPEG_CONF_OPTS += --disable-libvpx
 endif
 
 # ffmpeg freetype support require fenv.h which is only
-# available/working on glibc
-ifeq ($(BR2_PACKAGE_FREETYPE)$(BR2_TOOLCHAIN_USES_GLIBC),yy)
+# available/working on glibc.
+# The microblaze variant doesn't provide the needed exceptions
+ifeq ($(BR2_PACKAGE_FREETYPE)$(BR2_TOOLCHAIN_USES_GLIBC)x$(BR2_microblaze),yyx)
 FFMPEG_CONF_OPTS += --enable-libfreetype
 FFMPEG_DEPENDENCIES += freetype
 else