浏览代码

Merge pull request #679 from kissg1988/shadow

shadow: fix dependency issues
Steven Barth 10 年前
父节点
当前提交
7f5e667f98
共有 1 个文件被更改,包括 3 次插入4 次删除
  1. 3
    4
      utils/shadow/Makefile

+ 3
- 4
utils/shadow/Makefile 查看文件

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=shadow
11 11
 PKG_VERSION:=4.2.1
12
-PKG_RELEASE:=3
12
+PKG_RELEASE:=4
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15 15
 PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases
@@ -21,9 +21,8 @@ PKG_FIXUP:=autoreconf
21 21
 PKG_BUILD_PARALLEL:=1
22 22
 PKG_INSTALL:=1
23 23
 
24
-PKG_BUILD_DEPENDS:=libintl libiconv
25
-
26 24
 include $(INCLUDE_DIR)/package.mk
25
+include $(INCLUDE_DIR)/nls.mk
27 26
 
28 27
 SHADOW_APPLETS := \
29 28
 	chage groupadd groupdel groupmod groups passwd su \
@@ -65,7 +64,6 @@ endef
65 64
 
66 65
 define Package/shadow-utils
67 66
   $(call Package/shadow/Default)
68
-  DEPENDS:=+ALL:shadow
69 67
 endef
70 68
 
71 69
 define Package/shadow-utils/config
@@ -93,6 +91,7 @@ Package/shadow-utils/description = $(Package/shadow/description)
93 91
 define Package/shadow-common
94 92
   $(call Package/shadow/Default)
95 93
   TITLE:=Shared definitions for the PLD Linux shadow utilities
94
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
96 95
   HIDDEN:=1
97 96
 endef
98 97