Commit 4fd8bdc7 authored by Sven Neumann's avatar Sven Neumann Committed by Peter Korsgaard
Browse files

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: default avatarSven Neumann <s.neumann@raumfeld.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 328fc574

package/libglib2/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2 
	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT

	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

	select BR2_PACKAGE_LIBFFI

	select BR2_PACKAGE_ZLIB

	depends on BR2_USE_WCHAR # gettext

	help

package/libglib2/libglib2-fix-compilation-with-no-builtin-atomic.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001

From: Lionel Landwerlin <llandwerlin@gmail.com>

Date: Sat, 6 Nov 2010 14:56:15 +0100

Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers



Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>

---

 glib/gatomic.c |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)



diff --git a/glib/gatomic.c b/glib/gatomic.c

index 845c866..01468ce 100644

--- a/glib/gatomic.c

+++ b/glib/gatomic.c

@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi

 #endif /* DEFINE_WITH_WIN32_INTERLOCKED */

 

 #ifdef DEFINE_WITH_MUTEXES

+# include "gthread.h"

 /* We have to use the slow, but safe locking method */

 static GMutex *g_atomic_mutex; 

 

-- 

1.7.2.3

package/libglib2/libglib2.mk

+8 −8
Original line number Diff line number Diff line
@@ -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)
@@ -41,16 +41,16 @@ 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