diff options
| -rw-r--r-- | rules/glib.in | 2 | ||||
| -rw-r--r-- | rules/glib.make | 10 | ||||
| -rw-r--r-- | rules/host-glib.in | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/rules/glib.in b/rules/glib.in index 60264b6d5..e6cb8fcf8 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -7,7 +7,7 @@ menuconfig GLIB select GETTEXT_DUMMY if GLIB_GETTEXT_DUMMY select HOST_GLIB select ICONV - select ZLIB if GLIB_EXPERIMENTAL + select ZLIB help GLib is a library containing many useful C routines for things such as trees, hashes, lists, and strings. It is a useful diff --git a/rules/glib.make b/rules/glib.make index a0cbba27d..785916116 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_GLIB) += glib ifdef PTXCONF_GLIB_EXPERIMENTAL GLIB_VERSION := 2.25.10 else -GLIB_VERSION := 2.22.2 +GLIB_VERSION := 2.24.1 endif GLIB := glib-$(GLIB_VERSION) @@ -28,11 +28,7 @@ GLIB_SUFFIX := tar.bz2 GLIB_SOURCE := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX) GLIB_DIR := $(BUILDDIR)/$(GLIB) -ifdef PTXCONF_GLIB_EXPERIMENTAL -GLIB_URL := http://ftp.gtk.org/pub/glib/2.25/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) -else -GLIB_URL := http://ftp.gtk.org/pub/glib/2.22/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) -endif +GLIB_URL := http://ftp.gtk.org/pub/glib/$(basename $(GLIB_VERSION))/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) # ---------------------------------------------------------------------------- # Get @@ -109,7 +105,7 @@ endif ifdef PTXCONF_GLIB_EXPERIMENTAL GLIB_LIB_VERSION := 0.2510.0 else -GLIB_LIB_VERSION := 0.2200.2 +GLIB_LIB_VERSION := 0.2400.1 endif $(STATEDIR)/glib.targetinstall: diff --git a/rules/host-glib.in b/rules/host-glib.in index c9c09fcb4..68571d6f7 100644 --- a/rules/host-glib.in +++ b/rules/host-glib.in @@ -8,4 +8,4 @@ config HOST_GLIB # header check in glib. # FIXME what to do if we build a target system without iconv? select HOST_LIBICONV - select HOST_ZLIB if GLIB_EXPERIMENTAL + select HOST_ZLIB |