diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-01-31 08:18:30 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-01-31 08:29:05 +0100 |
| commit | 64a49804fb3b89e99c8b7840aebd66ff07f5f54c (patch) | |
| tree | e28df5c0ac82841209aef5aac8da6ab08af0ae81 /package | |
| parent | 283a4ba9969317b037d2dfdae948c6225a4d2d4f (diff) | |
| download | buildroot-64a49804fb3b89e99c8b7840aebd66ff07f5f54c.tar.gz buildroot-64a49804fb3b89e99c8b7840aebd66ff07f5f54c.zip | |
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>
Diffstat (limited to 'package')
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 |
