maemo5-compat: make it work and update toolchain to about same as SDK uses

- uses CSL 2007q3 (4.2.1 with armv7a support)
- binutils 2.18.50.7 should be similar to 2.18.50.20070820

bumped native tools:
- autoconf 2.63
- automake 1.11.1
- libtool 2.2.6b

bumped libraries:
- glib 2.20.3
- libpng 1.2.37

diff --git a/conf/distro/maemo5-compat.conf b/conf/distro/maemo5-compat.conf
index 1ef386a..35f579b 100644 (file)
--- a/conf/distro/maemo5-compat.conf
+++ b/conf/distro/maemo5-compat.conf
@@ -58,15 +58,17 @@ PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 PREFERRED_PROVIDER_util-linux = "util-linux"
 
-PREFERRED_VERSION_automake-native = "1.9.6"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_automake-native = "1.11.1"
 
-PREFERRED_VERSION_binutils = "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross    = "2.18"
+PREFERRED_VERSION_binutils         = "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross    = "2.18.50.0.7"
 
-PREFERRED_VERSION_gcc = "4.2.4"
-PREFERRED_VERSION_gcc-cross = "4.2.4"
-PREFERRED_VERSION_gcc-cross-initial = "4.4.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.4"
+GCCVERSION = "4.2.1+csl-arm-2007q3-53"
+PREFERRED_VERSION_gcc = "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross = "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-initial = "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-intermediate = "${GCCVERSION}"
 
 # Use recent enough version of the headers to let HAL build successfully.
 PREFERRED_VERSION_linux-libc-headers = "2.6.25"
@@ -74,9 +76,9 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.25"
 PREFERRED_VERSION_glibc = "2.5"
 PREFERRED_VERSION_glibc-initial = "2.5"
 
-PREFERRED_VERSION_libtool-native = "1.5.24"
-PREFERRED_VERSION_libtool-cross = "1.5.24"
-PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross = "2.2.6b"
+PREFERRED_VERSION_libtool = "2.2.6b"
 
 require conf/distro/include/sane-srcrevs.inc
 
@@ -84,11 +86,11 @@ PREFERRED_VERSION_fontconfig       = "2.6.0"
 PREFERRED_VERSION_freetype         = "2.3.6"
 PREFERRED_VERSION_freetype-native  = "2.3.6"
 PREFERRED_VERSION_cairo            = "1.8.0"
-PREFERRED_VERSION_glib-2.0         = "2.20.4"
+PREFERRED_VERSION_glib-2.0         = "2.20.3"
 PREFERRED_VERSION_pango            = "1.24.4"
 PREFERRED_VERSION_atk              = "1.20.0"
 PREFERRED_VERSION_gtk+             = "2.14.2"
-PREFERRED_VERSION_libpng           = "1.2.35"
+PREFERRED_VERSION_libpng           = "1.2.37"
 PREFERRED_VERSION_expat            = "1.95.7"
 
 # only dbus-glib 0.74 works with older dbus 1.0.x