aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-11-01 13:15:36 +0100
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-11-01 14:05:27 +0100
commit391f32aed27a6e5a060494771b049760fde24d78 (patch)
tree0ff3a556930151e507d96ec98f1cc83e44d846ac
parent2acaa86ce630f616b12aa92493e0269421c5bc97 (diff)
downloadbuildroot-391f32aed27a6e5a060494771b049760fde24d78.tar.gz
buildroot-391f32aed27a6e5a060494771b049760fde24d78.tar.bz2
package/libglib2: fix util-linux-libs dependency
Commit 2acaa86ce630f616b12aa92493e0269421c5bc97 replaced util-linux by util-linux-libs but this raises the following build failure: Makefile:585: *** util-linux-libs is in the dependency chain of libglib2 that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. To fix this build failure, use util-linux or util-linux-libs depending on BR2_PACKAGE_UTIL_LINUX_LIBS Fixes: - http://autobuild.buildroot.org/results/8bf6360a343edd10c73a756ab86cdba727f9ea43 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-rw-r--r--package/libglib2/libglib2.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 43fcb27fae..6e9dbd7b26 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -86,8 +86,12 @@ endif
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
LIBGLIB2_CONF_OPTS += -Dlibmount=enabled
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBS),y)
LIBGLIB2_DEPENDENCIES += util-linux-libs
else
+LIBGLIB2_DEPENDENCIES += util-linux
+endif
+else
LIBGLIB2_CONF_OPTS += -Dlibmount=disabled
endif