diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-07-21 10:25:27 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-02 08:10:00 +0200 |
| commit | 7e4fb83de7e65fe04cf5d2758181dcee411ceb4b (patch) | |
| tree | 4f1aa460cf77af3e840dca66c6a5ba902e99c397 /rules/glib.make | |
| parent | 05dcfde2f083020b6277ccd7d5c6ce8579b4d179 (diff) | |
| download | ptxdist-7e4fb83de7e65fe04cf5d2758181dcee411ceb4b.tar.gz ptxdist-7e4fb83de7e65fe04cf5d2758181dcee411ceb4b.tar.xz | |
[glib] version bump 2.22.2 -> 2.24.1
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
[mkl: zlib is mandatory for new glib version]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/glib.make')
| -rw-r--r-- | rules/glib.make | 10 |
1 files changed, 3 insertions, 7 deletions
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: |