From 012f32afcfff21558003cdb7d0a91dcdcb5bfd1d Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 6 Apr 2016 00:00:37 -0700
Subject: [PATCH 1/3] libiconv: don't overwrite glibc

---
 packages/addons/addon-depends/libiconv/package.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/addons/addon-depends/libiconv/package.mk b/packages/addons/addon-depends/libiconv/package.mk
index 15973fb0b8..b8f658c0e7 100644
--- a/packages/addons/addon-depends/libiconv/package.mk
+++ b/packages/addons/addon-depends/libiconv/package.mk
@@ -35,6 +35,8 @@ PKG_AUTORECONF="no"
 PKG_CONFIGURE_OPTS_TARGET="--host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
+            --includedir=/usr/include/iconv \
+            --libdir=/usr/lib/iconv \
             --sysconfdir=/etc \
             --enable-static \
             --disable-shared \

From 2545a7936b76df669351b84102d66311f2fd0b88 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 6 Apr 2016 00:03:33 -0700
Subject: [PATCH 2/3] tvheadend: add location of libiconv

---
 packages/addons/service/tvheadend/package.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/addons/service/tvheadend/package.mk b/packages/addons/service/tvheadend/package.mk
index 41d3055c37..69026867bc 100644
--- a/packages/addons/service/tvheadend/package.mk
+++ b/packages/addons/service/tvheadend/package.mk
@@ -44,6 +44,7 @@ pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
   export CROSS_COMPILE=$TARGET_PREFIX
+  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
 }
 
 configure_target() {

From 6ed7c2b6fa103bbcd3e811adad3bb0a463f886ac Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 6 Apr 2016 00:08:08 -0700
Subject: [PATCH 3/3] tvheadend: cleanup package.mk

---
 packages/addons/service/tvheadend/package.mk | 44 ++++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/addons/service/tvheadend/package.mk b/packages/addons/service/tvheadend/package.mk
index 69026867bc..f46c2371a5 100644
--- a/packages/addons/service/tvheadend/package.mk
+++ b/packages/addons/service/tvheadend/package.mk
@@ -36,36 +36,36 @@ PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"
 PKG_ADDON_REPOVERSION="7.0"
 
+PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
+                           --arch=$TARGET_ARCH \
+                           --cpu=$TARGET_CPU \
+                           --cc=$TARGET_CC \
+                           --enable-hdhomerun_client \
+                           --enable-hdhomerun_static \
+                           --disable-avahi \
+                           --disable-libav \
+                           --enable-inotify \
+                           --enable-epoll \
+                           --disable-uriparser \
+                           --enable-tvhcsa \
+                           --enable-bundle \
+                           --enable-dvbcsa \
+                           --disable-dbus_1 \
+                           --python=$ROOT/$TOOLCHAIN/bin/python"
+
 post_unpack() {
   sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$PKG_ADDON_REPOVERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
 }
 
-pre_build_target() {
-  mkdir -p $PKG_BUILD/.$TARGET_NAME
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+pre_configure_target() {
+# fails to build in subdirs
+  cd $ROOT/$PKG_BUILD
+  rm -rf .$TARGET_NAME
+
   export CROSS_COMPILE=$TARGET_PREFIX
   export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
 }
 
-configure_target() {
-  ./configure --prefix=/usr \
-            --arch=$TARGET_ARCH \
-            --cpu=$TARGET_CPU \
-            --cc=$TARGET_CC \
-            --enable-hdhomerun_client \
-            --enable-hdhomerun_static \
-            --disable-avahi \
-            --disable-libav \
-            --enable-inotify \
-            --enable-epoll \
-            --disable-uriparser \
-            --enable-tvhcsa \
-            --enable-bundle \
-            --enable-dvbcsa \
-            --disable-dbus_1 \
-            --python=$ROOT/$TOOLCHAIN/bin/python
-}
-
 post_make_target() {
   $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
 }