mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGLIB2_VERSION_MAJOR = 2.60
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).6
|
||||
LIBGLIB2_VERSION_MAJOR = 2.64
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
|
||||
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+
|
||||
@@ -28,11 +28,11 @@ HOST_LIBGLIB2_CONF_OPTS = \
|
||||
-Dxattr=false \
|
||||
-Dinternal_pcre=false \
|
||||
-Dinstalled_tests=false \
|
||||
-Dtests=false
|
||||
-Doss_fuzz=disabled
|
||||
|
||||
LIBGLIB2_DEPENDENCIES = \
|
||||
host-pkgconf host-libglib2 \
|
||||
libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
libffi pcre zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
HOST_LIBGLIB2_DEPENDENCIES = \
|
||||
host-gettext \
|
||||
@@ -49,7 +49,13 @@ HOST_LIBGLIB2_DEPENDENCIES = \
|
||||
LIBGLIB2_CONF_OPTS = \
|
||||
-Dinternal_pcre=false \
|
||||
-Dgio_module_dir=/usr/lib/gio/modules \
|
||||
-Dtests=false
|
||||
-Dinstalled_tests=false \
|
||||
-Doss_fuzz=disabled
|
||||
|
||||
LIBGLIB2_MESON_EXTRA_PROPERTIES = \
|
||||
have_c99_vsnprintf=true \
|
||||
have_c99_snprintf=true \
|
||||
have_unix98_printf=true
|
||||
|
||||
ifneq ($(BR2_ENABLE_LOCALE),y)
|
||||
LIBGLIB2_DEPENDENCIES += libiconv
|
||||
@@ -60,7 +66,7 @@ LIBGLIB2_DEPENDENCIES += elfutils
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
LIBGLIB2_CONF_OPTS += -Diconv=gnu
|
||||
LIBGLIB2_CONF_OPTS += -Diconv=external
|
||||
LIBGLIB2_DEPENDENCIES += libiconv
|
||||
endif
|
||||
|
||||
@@ -78,6 +84,13 @@ define LIBGLIB2_REMOVE_GDB_FILES
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
|
||||
LIBGLIB2_CONF_OPTS += -Dlibmount=enabled
|
||||
LIBGLIB2_DEPENDENCIES += util-linux
|
||||
else
|
||||
LIBGLIB2_CONF_OPTS += -Dlibmount=disabled
|
||||
endif
|
||||
|
||||
# Purge useless binaries from target
|
||||
define LIBGLIB2_REMOVE_DEV_FILES
|
||||
rm -rf $(TARGET_DIR)/usr/lib/glib-2.0
|
||||
|
||||
Reference in New Issue
Block a user