Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Makefile.ffmpeg: try to fix target for libvpx for i686
  • Loading branch information
perexg committed Mar 26, 2016
1 parent da3cc12 commit 5be888d
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions Makefile.ffmpeg
Expand Up @@ -19,6 +19,10 @@
DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(DIR)/.config.mk

ifneq (,$(filter i386 i486 i586 i686 pentium,$(ARCH)))
FFMPEG_TARGET := $(ARCH)-linux-gnu
endif

unexport CFLAGS
unexport LDFLAGS

Expand Down Expand Up @@ -155,8 +159,8 @@ LIBX264_HOST := --host=$(DEB_BUILD_GNU_TYPE)
endif

ifeq (,$(LIBX264_HOST))
ifneq (,$(filter i386 i486 i586 i686 pentium,$(ARCH)))
LIBX264_HOST := --host=$(ARCH)-linux-gnu
ifneq (,$(FFMPEG_TARGET))
LIBX264_HOST := --host=$(FFMPEG_TARGET)
endif
endif

Expand Down Expand Up @@ -249,6 +253,10 @@ endif

ifeq (yes,$(CONFIG_LIBVPX_STATIC))

ifneq (,$(FFMPEG_TARGET))
LIBVPX_TARGET := --target=$(FFMPEG_TARGET)
endif

$(LIB_ROOT)/$(LIBVPX)/.tvh_download:
$(call DOWNLOAD,$(LIBVPX_URL),$(LIB_ROOT)/$(LIBVPX_TB),$(LIBVPX_SHA1))
$(call UNTAR,$(LIBVPX_TB),j)
Expand All @@ -260,7 +268,8 @@ $(LIB_ROOT)/$(LIBVPX)/.tvh_build: \
cd $(LIB_ROOT)/$(LIBVPX) && $(CONFIGURE) \
--disable-examples \
--disable-docs \
--disable-unit-tests
--disable-unit-tests \
$(LIBVPX_TARGET)
DIST_DIR=$(EPREFIX) \
$(MAKE) -C $(LIB_ROOT)/$(LIBVPX) install
@touch $@
Expand Down

0 comments on commit 5be888d

Please sign in to comment.