bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] minidlna: fix iconv switch fallout

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@25340 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-02-03 10:40:20 +00:00
parent 6ee58e49e8
commit c23fcc1524
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multimedia/minidlna/Makefile
View File

@ -21,6 +21,10 @@ PKG_BUILD_PARALLEL:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
MAKE_VARS += \
ICONV_PREFIX="$(ICONV_PREFIX)" \
INTL_PREFIX="$(INTL_PREFIX)"
define Package/minidlna define Package/minidlna
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia

12
multimedia/minidlna/patches/002-makefile-tweaks.patch
View File

@ -15,17 +15,17 @@
+ -I$(STAGING_DIR)/usr/include/libexif \ + -I$(STAGING_DIR)/usr/include/libexif \
+ -I$(STAGING_DIR)/usr/include/uuid \ + -I$(STAGING_DIR)/usr/include/uuid \
+ -I$(STAGING_DIR)/usr/include/vorbis \ + -I$(STAGING_DIR)/usr/include/vorbis \
+ -I$(STAGING_DIR)/usr/lib/libiconv/include \ + -I$(ICONV_PREFIX)/include \
+ -I$(STAGING_DIR)/usr/lib/libintl/include + -I$(INTL_PREFIX)/include
+LDFLAGS = -L$(STAGING_DIR)/usr/lib \ +LDFLAGS = -L$(STAGING_DIR)/usr/lib \
+ -L$(STAGING_DIR)/usr/lib/libintl/lib \ + -L$(ICONV_PREFIX)/lib \
+ -L$(STAGING_DIR)/usr/lib/libiconv/lib \ + -L$(INTL_PREFIX)/lib \
+ -Wl,-rpath=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=$(STAGING_DIR)/usr/lib \
+ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
#STATIC_LINKING: LDFLAGS = -static #STATIC_LINKING: LDFLAGS = -static
CC = gcc CC = gcc
RM = rm -f RM = rm -f
@@ -36,7 +48,7 @@ @@ -36,7 +48,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
ALLOBJS = $(BASEOBJS) $(LNXOBJS) ALLOBJS = $(BASEOBJS) $(LNXOBJS)
@ -34,7 +34,7 @@
#STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
@@ -58,7 +70,7 @@ @@ -58,7 +70,7 @@ install: minidlna
$(INSTALL) -d $(ETCINSTALLDIR) $(INSTALL) -d $(ETCINSTALLDIR)
$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)