summaryrefslogtreecommitdiffstats
path: root/rules/glib.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2009-10-29 15:18:08 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2009-10-30 12:29:55 +0100
commite9b5c2ceadbfd2bec8bbb34fc520f870e670bcc7 (patch)
treed80f660560bf164689378a9ec9f211b17de81030 /rules/glib.make
parent8becbf2a653f112c8a0a063a91e5a0459c7cdafb (diff)
downloadptxdist-e9b5c2ceadbfd2bec8bbb34fc520f870e670bcc7.tar.gz
ptxdist-e9b5c2ceadbfd2bec8bbb34fc520f870e670bcc7.tar.xz
[glib] version bump -> 2.22.2 and remove option for devel version
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/glib.make')
-rw-r--r--rules/glib.make16
1 files changed, 3 insertions, 13 deletions
diff --git a/rules/glib.make b/rules/glib.make
index 4e75fe92e..0c8fe075a 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -18,12 +18,7 @@ PACKAGES-$(PTXCONF_GLIB) += glib
#
# Paths and names
#
-ifdef PTXCONF_GLIB__VERSION_2_18
-GLIB_VERSION := 2.18.4
-endif
-ifdef PTXCONF_GLIB__VERSION_2_19
-GLIB_VERSION := 2.19.10
-endif
+GLIB_VERSION := 2.22.2
GLIB := glib-$(GLIB_VERSION)
GLIB_SUFFIX := tar.bz2
@@ -32,7 +27,7 @@ GLIB_DIR := $(BUILDDIR)/$(GLIB)
GLIB_URL := \
http://ftp.gtk.org/pub/glib/2.18/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) \
- http://ftp.gtk.org/pub/glib/2.19/glib-$(GLIB_VERSION).$(GLIB_SUFFIX)
+ http://ftp.gtk.org/pub/glib/2.22/glib-$(GLIB_VERSION).$(GLIB_SUFFIX)
# ----------------------------------------------------------------------------
# Get
@@ -99,12 +94,7 @@ GLIB_AUTOCONF := \
# Target-Install
# ----------------------------------------------------------------------------
-ifdef PTXCONF_GLIB__VERSION_2_18
-GLIB_LIB_VERSION := 0.1800.4
-endif
-ifdef PTXCONF_GLIB__VERSION_2_19
-GLIB_LIB_VERSION := 0.1910.0
-endif
+GLIB_LIB_VERSION := 0.2200.2
$(STATEDIR)/glib.targetinstall:
@$(call targetinfo)