From cd79ad3e4509fee349d69d946c20d38f0a7529a6 Mon Sep 17 00:00:00 2001 From: wittinobi Date: Wed, 19 Feb 2014 00:51:43 +0100 Subject: [PATCH] fix ushare --- Makefile | 4 ++-- make/applications.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8bb34a7..d79cb62 100755 --- a/Makefile +++ b/Makefile @@ -190,9 +190,9 @@ neutrino-libs: # applications.mk applications-all: if [ $(LCD4LINUX) = "yes" ]; then \ - $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/xupnpd $(D)/lcd4linux; \ + $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/ushare $(D)/xupnpd $(D)/lcd4linux; \ else \ - $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/xupnpd; \ + $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/ushare $(D)/xupnpd; \ fi # plugins.mk diff --git a/make/applications.mk b/make/applications.mk index 38af665..6c62902 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -468,8 +468,9 @@ $(D)/ushare: $(D)/libupnp $(ARCHIVE)/ushare-1.1a.tar.bz2 | $(TARGETPREFIX) pushd $(BUILD_TMP)/ushare-1.1a && \ $(PATCH)/ushare1.1a.diff && \ PKG_CONFIG_PATH="$(TARGETPREFIX)/lib/pkgconfig" \ - CFLAGS="-I$(TARGETPREFIX)/include/ -I$(TARGETPREFIX)/include/upnp" \ - LDFLAGS="-L$(TARGETPREFIX)/lib -lz" \ + CFLAGS="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/upnp" \ + LDFLAGS="-L$(TARGETPREFIX)/lib -lz -liconv" \ + 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"@' && \ sed -i config.h -e 's@LOCALEDIR.*@LOCALEDIR "/share"@' && \ -- 2.39.5