Browse Source

mpd: Fix BUILD_NLS=y full language support (regression)

Signed-off-by: Ted Hess <thess@kitschensync.net>
Ted Hess 9 years ago
parent
commit
7bf829e657
1 changed files with 4 additions and 3 deletions
  1. 4
    3
      sound/mpd/Makefile

+ 4
- 3
sound/mpd/Makefile View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=mpd
11 11
 PKG_VERSION:=0.19.10
12
-PKG_RELEASE:=1
12
+PKG_RELEASE:=2
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15 15
 PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.19/
@@ -28,13 +28,14 @@ PKG_CONFIG_DEPENDS:= \
28 28
 PKG_INSTALL:=1
29 29
 
30 30
 include $(INCLUDE_DIR)/package.mk
31
+include $(INCLUDE_DIR)/nls.mk
31 32
 
32 33
 define Package/mpd/Default
33 34
   SECTION:=sound
34 35
   CATEGORY:=Sound
35 36
   TITLE:=Music Player Daemon
36 37
   URL:=http://www.musicpd.org/
37
-  DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient +libstdcpp \
38
+  DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \
38 39
 	    +libflac +BUILD_PATENTED:libmad +libvorbisidec +AUDIO_SUPPORT:alsa-lib \
39 40
             +boost +boost-container +libexpat
40 41
 endef
@@ -151,7 +152,7 @@ CONFIGURE_VARS += \
151 152
 	$(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
152 153
 	$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
153 154
 
154
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
155
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv)
155 156
 
156 157
 ifeq ($(BUILD_VARIANT),full)
157 158