From 85fadc92b7c93bd2f74e7dae13d602a0adbbe0ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Tue, 29 Jun 2010 18:32:14 +0200 Subject: [PATCH] contribs: fix FFmpeg target when building ARM Specify --target-os=linux when HAVE_LINUX is 1 Don't depend on libvpx on armel --- extras/contrib/src/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 0d488e8cb1..ff8eab463d 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree endif ifdef HAVE_LINUX +FFMPEGCONF+= --target-os=linux ifdef HAVE_MAEMO ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),) FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 @@ -1112,8 +1113,12 @@ else ifdef HAVE_UCLIBC .ffmpeg: ffmpeg else +ifeq ($(ARCH),armel) +.ffmpeg: ffmpeg .lame .gsm .zlib +else .ffmpeg: ffmpeg .lame .gsm .libvpx .zlib endif +endif endif (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers) touch $@ -- 2.39.2