jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 06:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/libglib2: make util-linux an optional dependency

Browse Source 
libglib2 needs util-linux only for libmount, which is a configuration option.
Instead, check if util-linux-libmount is selected, and if so, set the option
to true.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adam Duskett 2019-09-16 12:16:05 -07:00 committed by Thomas Petazzoni
parent bb912cb36d
commit e5353e7558
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/libglib2/Config.in
View File

@ -7,8 +7,6 @@ config BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE
select BR2_PACKAGE_PCRE_UCP select BR2_PACKAGE_PCRE_UCP
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
Low-level core library that forms the basis of GTK+ and GNOME. Low-level core library that forms the basis of GTK+ and GNOME.

10
package/libglib2/libglib2.mk
View File

@ -33,7 +33,7 @@ HOST_LIBGLIB2_CONF_OPTS = \
LIBGLIB2_DEPENDENCIES = \ LIBGLIB2_DEPENDENCIES = \
host-pkgconf host-libglib2 \ host-pkgconf host-libglib2 \
libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES) libffi pcre zlib $(TARGET_NLS_DEPENDENCIES)
HOST_LIBGLIB2_DEPENDENCIES = \ HOST_LIBGLIB2_DEPENDENCIES = \
host-gettext \ host-gettext \
@ -80,6 +80,14 @@ define LIBGLIB2_REMOVE_GDB_FILES
endef endef
endif endif
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
LIBGLIB2_CONF_OPTS += -Dlibmount=true
LIBGLIB2_DEPENDENCIES += util-linux
else
LIBGLIB2_CONF_OPTS += -Dlibmount=false
endif
# Purge useless binaries from target # Purge useless binaries from target
define LIBGLIB2_REMOVE_DEV_FILES define LIBGLIB2_REMOVE_DEV_FILES
rm -rf $(TARGET_DIR)/usr/lib/glib-2.0 rm -rf $(TARGET_DIR)/usr/lib/glib-2.0