From 5cfe404388d6fa898255568f89d72906c79b8209 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 19 Feb 2017 18:16:13 +0100 Subject: [PATCH] Build libiconv only for apollo & kronos --- make/applications.mk | 9 ++++----- make/neutrino.mk | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 6675607..8aebe7d 100755 --- 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 9ddce61..4fc3daa 100755 --- 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 $@ -- 2.39.5