tvheadend: fix compile on platforms with VFP

bundle.o was compiled with incompatible setting resulting in error at linking
Solution: add CFLAGS to Makefile and fix it

Error found on buildbot for target sunxi

Error message:
build.linux/tvheadend uses VFP register arguments, ./build.linux/bundle.o does not

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 40699

diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index 269aff7bcc8e350fb11215795eed02ada936fa27..e76c5897950ade8748cc517f8386386890cc83b5 100644 (file)
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -72,7 +72,6 @@ define Package/tvheadend/install
        $(INSTALL_BIN) ./files/tvheadend.init $(1)/etc/init.d/tvheadend
        $(INSTALL_DIR) $(1)/lib/upgrade/keep.d
        $(INSTALL_DATA) ./files/tvheadend.upgrade $(1)/lib/upgrade/keep.d/tvheadend
-       
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/build.linux/tvheadend $(1)/usr/bin/
 endef

diff --git a/multimedia/tvheadend/patches/001-fix_Makefile_VFP_CFLAGS.patch b/multimedia/tvheadend/patches/001-fix_Makefile_VFP_CFLAGS.patch
new file mode 100644 (file)
index 0000000..ba13c4c
--- /dev/null
+++ b/multimedia/tvheadend/patches/001-fix_Makefile_VFP_CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -282,7 +282,7 @@ include support/${OSENV}.mk
+ # Bundle files
+ $(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c
+       @mkdir -p $(dir $@)
+-      $(CC) -I${CURDIR}/src -c -o $@ $<
++      $(CC) $(CFLAGS) -I${CURDIR}/src -c -o $@ $<
+ 
+ $(BUILDDIR)/bundle.c:
+       @mkdir -p $(dir $@)