]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
build: fix x264 pbuilder compilation issues
authorAdam Sutton <dev@adamsutton.me.uk>
Sat, 16 Jan 2016 23:22:44 +0000 (23:22 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Sat, 16 Jan 2016 23:26:33 +0000 (23:26 +0000)
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

Makefile.ffmpeg

index 1f25a9484c53f365d04331ff414cc3e21bb30786..bfcea2c1f15f58ab5b790058e134ecc477d9ecdd 100644 (file)
@@ -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-*
@@ -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 $@