diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-02-01 10:52:20 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-08 14:24:11 +0100 |
| commit | 9d3bc50a5ec12241eff062e9adf46ae82f11f82f (patch) | |
| tree | 8d7e836f4e15753adbde0e77df57158cb08a396c /rules/glib.make | |
| parent | d35384a1e21b4b2922dda29229d79af98f3ccdc9 (diff) | |
| download | ptxdist-9d3bc50a5ec12241eff062e9adf46ae82f11f82f.tar.gz ptxdist-9d3bc50a5ec12241eff062e9adf46ae82f11f82f.tar.xz | |
glib: version bump 2.26.0 -> 2.27.93, 2.24.1 -> 2.26.1
This reflects the current state of "stable" and "experimental" branches
for glib.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules/glib.make')
| -rw-r--r-- | rules/glib.make | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/rules/glib.make b/rules/glib.make index 457c2c28a..c4aaae186 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_GLIB) += glib # Paths and names # ifdef PTXCONF_GLIB_EXPERIMENTAL -GLIB_VERSION := 2.26.0 +GLIB_VERSION := 2.27.93 else -GLIB_VERSION := 2.24.1 +GLIB_VERSION := 2.26.1 endif GLIB := glib-$(GLIB_VERSION) @@ -58,7 +58,6 @@ GLIB_ENV := \ # is the right choice for no locales and locales-via-libc # -ifdef PTXCONF_GLIB_EXPERIMENTAL GLIB_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --enable-silent-rules \ @@ -79,37 +78,11 @@ GLIB_AUTOCONF := \ --enable-shared \ --with-libiconv=no \ --disable-gcov -else -GLIB_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ - --enable-threads \ - --with-threads=posix \ - --enable-static \ - --enable-shared \ - --disable-selinux \ - --disable-gtk-doc \ - --disable-man \ - --disable-gc-friendly \ - --disable-fast-install \ - --disable-libtool-lock \ - --disable-included-printf \ - --disable-fam \ - --disable-xattr \ - --with-gnu-ld \ - --with-pcre=internal \ - --with-libiconv=no -endif # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -ifdef PTXCONF_GLIB_EXPERIMENTAL -GLIB_LIB_VERSION := 0.2600.0 -else -GLIB_LIB_VERSION := 0.2400.1 -endif - $(STATEDIR)/glib.targetinstall: @$(call targetinfo) |