Build libiconv only for apollo & kronos

diff --git a/make/applications.mk b/make/applications.mk
index 66756073bdc546a125f8bebb24fa13bbeab919d9..8aebe7da5070d83296c0343051aa3584eb8eb5b3 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -651,17 +651,16 @@ $(D)/fuse: $(ARCHIVE)/fuse-2.9.2.tar.gz | $(TARGETPREFIX)
        touch $@
 
 ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
-WITH_GETTEXT = -lintl
-else
-WITH_GETTEXT =
+  WITH_GETTEXT = -lintl -liconv
+  LIBGETTEXT = $(D)/gettext
 endif
-$(D)/ushare: $(D)/libupnp $(D)/gettext $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/ushare: $(D)/libupnp $(LIBGETTEXT) $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 | $(TARGETPREFIX)
        $(UNTAR)/ushare-$(USHARE_VER).tar.bz2
        pushd $(BUILD_TMP)/ushare-$(USHARE_VER) && \
                $(PATCH)/ushare$(USHARE_VER).diff && \
                PKG_CONFIG_PATH="$(TARGETPREFIX)/lib/pkgconfig" \
                CFLAGS="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/upnp" \
-               LDFLAGS="-L$(TARGETPREFIX)/lib -lz -liconv $(WITH_GETTEXT)" \
+               LDFLAGS="-L$(TARGETPREFIX)/lib -lz $(WITH_GETTEXT)" \
                LIBS="-Wl,--rpath-link -Wl,$(TARGETPREFIX)/lib" \
                ./configure --prefix=$(TARGETPREFIX) --cross-prefix=$(TARGET)- --cross-compile --with-libupnp-dir=$(TARGETPREFIX)/lib/ --disable-dlna  && \
                sed -i config.h  -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@' && \

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 9ddce61c2f57c3c1c2ce20916d621baa3e1c9eb3..4fc3daa118e57f9b500e976771605857048a5784 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -37,7 +37,7 @@ N_CPPFLAGS += -Werror -Wsign-compare
 # the original build script links against openssl.
 # N_LDFLAGS  = -L$(TARGETPREFIX)/lib -lcurl -lssl -lcrypto -ldl
 # the original build script links against openssl, but it is not needed at all.
-N_LDFLAGS  = -L$(TARGETPREFIX)/lib -lcurl -liconv -ldl -lz
+N_LDFLAGS  = -L$(TARGETPREFIX)/lib -lcurl -ldl -lz
 N_LDFLAGS += -Wl,-rpath-link,$(TARGETLIB)
 
 # finally we can build outside of the source directory
@@ -59,7 +59,7 @@ N_CONFIG_OPTS += --enable-flac
 NEUTRINO_DEPS += libflac
 endif
 ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
-  NEUTRINO_DEPS += cortex-strings
+  NEUTRINO_DEPS += libiconv cortex-strings
 endif
 
 neutrino-deps: $(NEUTRINO_DEPS)
@@ -107,5 +107,5 @@ $(TARGETPREFIX)/.version:
        echo "builddate=`cd $(SOURCE_DIR)/neutrino-hd && git log | grep "^commit" | wc -l` vom `date --reference=$(SOURCE_DIR)/neutrino-hd/.git`"               >> $@
 
 $(D)/neutrino-hd-libs:
-       $(MAKE) $(D)/libsigc $(D)/giflib $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libiconv $(D)/libdvbsi++ $(D)/ffmpeg $(D)/libbluray $(D)/openthreads $(D)/libusb $(D)/luaposix $(D)/luacurl $(D)/lua-socket $(D)/lua-expat
+       $(MAKE) $(D)/libsigc $(D)/giflib $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libdvbsi++ $(D)/ffmpeg $(D)/libbluray $(D)/openthreads $(D)/libusb $(D)/luaposix $(D)/luacurl $(D)/lua-socket $(D)/lua-expat
        touch $@