From 63050c4c6031c2408c0b67400a4b501e315ae96f Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Sun, 30 Aug 2020 16:07:03 +0200 Subject: [PATCH] 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) --- package/util-linux/util-linux.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 75b76957fc..3aa51f24fb 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -82,10 +82,6 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -UTIL_LINUX_DEPENDENCIES += libcap-ng -endif - # Unfortunately, the util-linux does LIBS="" at the end of its # configure script. So we have to pass the proper LIBS value when # calling the configure script to make configure tests pass properly, @@ -106,6 +102,9 @@ define UTIL_LINUX_SELINUX_PAMFILES_TWEAK endef endif +# Used by setpriv +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng) + # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) -- 2.30.2