From: Gergely Kiss <mail.gery@gmail.com>
Date: Sat, 20 Dec 2014 22:01:56 +0000 (+0100)
Subject: shadow: fix libintl/libiconv dependencies
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3e0466eaff95d6ac4eca4ee90fd7c9afc51a6de9;p=feed%2Fpackages.git

shadow: fix libintl/libiconv dependencies

Include nls.mk rather than explicitly using the stub versions.
This allows to make the packages depend on the full versions
of libiconv & libintl and thus to have full language support.

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
---

diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile
index 2bab536155..0899248a29 100644
--- a/utils/shadow/Makefile
+++ b/utils/shadow/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadow
 PKG_VERSION:=4.2.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases
@@ -21,9 +21,8 @@ PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-PKG_BUILD_DEPENDS:=libintl libiconv
-
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 SHADOW_APPLETS := \
 	chage groupadd groupdel groupmod groups passwd su \
@@ -93,6 +92,7 @@ Package/shadow-utils/description = $(Package/shadow/description)
 define Package/shadow-common
   $(call Package/shadow/Default)
   TITLE:=Shared definitions for the PLD Linux shadow utilities
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
   HIDDEN:=1
 endef