aboutsummaryrefslogtreecommitdiff
path: root/package/libglib2/libglib2.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/libglib2/libglib2.mk')
-rw-r--r--package/libglib2/libglib2.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index fda04334f5..4b2569eed2 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,12 +4,14 @@
#
################################################################################
-LIBGLIB2_VERSION_MAJOR = 2.64
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
+LIBGLIB2_VERSION_MAJOR = 2.66
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
LIBGLIB2_LICENSE = LGPL-2.1+
LIBGLIB2_LICENSE_FILES = COPYING
+LIBGLIB2_CPE_ID_VENDOR = gnome
+LIBGLIB2_CPE_ID_NAME = glib
LIBGLIB2_INSTALL_STAGING = YES
LIBGLIB2_CFLAGS = $(TARGET_CFLAGS)
@@ -86,7 +88,11 @@ 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