Revert "libglib2: bump to version 2.50.0"

This reverts commit 4c7c010f9fae01399070844991252d3f5b9aae5f.

The bump to libglib2 2.25.0 causes a large number of build failures due
to the redefinition of crc32() in both util-linux libblkid and
zlib.

Fixes:

  http://autobuild.buildroot.net/results/ac65c9177dd63fc8d76dba3b9845f81b15faa716/
  (and approximately 500 other similar build failures)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2016-10-09 15:12:15 +02:00
parent 2f556ab99f
commit 40da5b434d
3 changed files with 5 additions and 7 deletions

View File

@ -5,8 +5,6 @@ config BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_PCRE_UCP
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
select BR2_PACKAGE_ZLIB
depends on BR2_USE_WCHAR # gettext
depends on BR2_TOOLCHAIN_HAS_THREADS

View File

@ -1,2 +1,2 @@
# https://download.gnome.org/sources/glib/2.50/glib-2.50.0.sha256sum
sha256 830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70 glib-2.50.0.tar.xz
# https://download.gnome.org/sources/glib/2.48/glib-2.48.2.sha256sum
sha256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 glib-2.48.2.tar.xz

View File

@ -4,8 +4,8 @@
#
################################################################################
LIBGLIB2_VERSION_MAJOR = 2.50
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
LIBGLIB2_VERSION_MAJOR = 2.48
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
LIBGLIB2_LICENSE = LGPLv2+
@ -102,7 +102,7 @@ HOST_LIBGLIB2_CONF_OPTS = \
LIBGLIB2_DEPENDENCIES = \
host-pkgconf host-libglib2 host-gettext \
libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
libffi pcre zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
HOST_LIBGLIB2_DEPENDENCIES = \
host-gettext host-libffi host-pcre host-pkgconf host-zlib