2
1
Эх сурвалжийг харах

util-linux: organize libcap-ng dependency like the others

Reformat the dependency on libcap-ng same as other dependencies: in one
line, preceded by a comment that it is used only by setpriv.

This also makes it clear why it's not included in util-linux-libs.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Arnout Vandecappelle (Essensium/Mind) 5 жил өмнө
parent
commit
63050c4c60

+ 3 - 4
package/util-linux/util-linux.mk

@@ -82,10 +82,6 @@ endif
 UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses
 UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses
 endif
 endif
 
 
-ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
-UTIL_LINUX_DEPENDENCIES += libcap-ng
-endif
-
 # Unfortunately, the util-linux does LIBS="" at the end of its
 # Unfortunately, the util-linux does LIBS="" at the end of its
 # configure script. So we have to pass the proper LIBS value when
 # configure script. So we have to pass the proper LIBS value when
 # calling the configure script to make configure tests pass properly,
 # calling the configure script to make configure tests pass properly,
@@ -106,6 +102,9 @@ define UTIL_LINUX_SELINUX_PAMFILES_TWEAK
 endef
 endef
 endif
 endif
 
 
+# Used by setpriv
+UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng)
+
 # Used by cramfs utils
 # Used by cramfs utils
 UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)
 UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)