summaryrefslogtreecommitdiffstats
path: root/package/libglib2/libglib2.mk
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2012-02-27 13:38:55 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2012-02-28 09:22:03 +0100
commit4fd8bdc7da9e69d7c7515f1577de3e5c427dde89 (patch)
tree6c9f4923789a23589544ee974405686ac5efb080 /package/libglib2/libglib2.mk
parent328fc5747279ff00fcc619d1eda81bf139f3221c (diff)
downloadbuildroot-novena-4fd8bdc7da9e69d7c7515f1577de3e5c427dde89.tar.gz
buildroot-novena-4fd8bdc7da9e69d7c7515f1577de3e5c427dde89.zip
libglib2: update to version 2.30.2
Update to latest stable release and add a dependency on libffi which is needed by GObject. [Peter: fixup build on uClibc] Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libglib2/libglib2.mk')
-rw-r--r--package/libglib2/libglib2.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 0832ac335..d0d9c5c2e 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,8 +3,8 @@
# libglib2
#
#############################################################
-LIBGLIB2_VERSION_MAJOR = 2.28
-LIBGLIB2_VERSION_MINOR = 8
+LIBGLIB2_VERSION_MAJOR = 2.30
+LIBGLIB2_VERSION_MINOR = 2
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
@@ -13,7 +13,7 @@ LIBGLIB2_INSTALL_STAGING = YES
LIBGLIB2_INSTALL_TARGET = YES
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
-LIBGLIB2_CONF_ENV = \
+LIBGLIB2_CONF_ENV = \
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \
ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
@@ -41,24 +41,24 @@ LIBGLIB2_CONF_ENV = \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
- ac_cv_func_posix_getgrgid_r=no \
+ ac_cv_func_posix_getgrgid_r=no glib_cv_have_qsort_r=yes \
gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
HOST_LIBGLIB2_CONF_OPT = \
--disable-gtk-doc \
--enable-debug=no \
-LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
-HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib
+HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
ifneq ($(BR2_ENABLE_LOCALE),y)
-LIBGLIB2_DEPENDENCIES+=libiconv
+LIBGLIB2_DEPENDENCIES += libiconv
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
LIBGLIB2_CONF_OPT += --with-libiconv=gnu
-LIBGLIB2_DEPENDENCIES+=libiconv
+LIBGLIB2_DEPENDENCIES += libiconv
endif
define LIBGLIB2_REMOVE_DEV_FILES