From: Jaroslav Kysela Date: Sat, 26 Mar 2016 20:16:02 +0000 (+0100) Subject: Makefile.ffmpeg: override --host for i686 X-Git-Tag: v4.2.1~793 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd9f07fb865e5700156546ee326fbaf42ee99cf8;p=thirdparty%2Ftvheadend.git Makefile.ffmpeg: override --host for i686 --- diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg index 9ead3b85e..cd224dfdf 100644 --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg @@ -324,6 +324,12 @@ endif ifeq (yes,$(CONFIG_LIBTHEORA_STATIC)) +ifeq (,$(LIBTHEORA_HOST)) +ifneq (,$(FFMPEG_HOST)) +LIBTHEORA_HOST := --host=$(FFMPEG_HOST) +endif +endif + $(LIB_ROOT)/$(LIBTHEORA)/.tvh_download: $(call DOWNLOAD,$(LIBTHEORA_URL),$(LIB_ROOT)/$(LIBTHEORA_TB),$(LIBTHEORA_SHA1)) $(call UNTAR,$(LIBTHEORA_TB),z) @@ -335,7 +341,8 @@ $(LIB_ROOT)/$(LIBTHEORA)/.tvh_build: \ $(LIB_ROOT)/$(LIBTHEORA)/.tvh_download cd $(LIB_ROOT)/$(LIBTHEORA) && $(CONFIGURE) \ --with-ogg=$(EPREFIX) \ - --disable-examples + --disable-examples \ + $(LIBTHEORA_HOST) DESTDIR=$(EBUILDIR) \ $(MAKE) -C $(LIB_ROOT)/$(LIBTHEORA) install @touch $@