Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
build: fix x264 pbuilder compilation issues
Problem is caused by uname reporting the host (not guest) architecture and
the x264 configure scripts trying to discover arch using uname.

Changed our configure call to pass in host spec from pbuilder environment
when it's available
  • Loading branch information
adamsutton committed Jan 16, 2016
1 parent 5503511 commit a46818c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Makefile.ffmpeg
Expand Up @@ -261,6 +261,10 @@ $(LIBAVDIR)/$(LIBX264)/.tvh_build: $(LIBAVDIR)/$(LIBX264)/.tvh_download

else

ifneq (,$(DEB_BUILD_GNU_TYPE))
LIBX264_HOST := --host=$(DEB_BUILD_GNU_TYPE)
endif

$(LIBAVDIR)/$(LIBX264)/.tvh_download:
$(call DOWNLOAD,$(LIBX264_URL),$(LIBAVDIR)/$(LIBX264_TB),$(LIBX264_SHA1))
#rm -rf $(LIBAVDIR)/x264-snapshot-*
Expand All @@ -280,7 +284,8 @@ $(LIBAVDIR)/$(LIBX264)/.tvh_build: \
--disable-lavf \
--disable-ffms \
--disable-gpac \
--disable-lsmash
--disable-lsmash \
$(LIBX264_HOST)
DESTDIR=$(LIBAVDIR)/build \
$(MAKE) -C $(LIBAVDIR)/$(LIBX264) install
@touch $@
Expand Down

0 comments on commit a46818c

Please sign in to comment.