From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Sun, 3 Sep 2006 22:43:59 +0000 (+0000)
Subject: conf/distro/jlime-donkey.conf : GTK related versions remove, bugfix
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ddfa8fba208fc9c874480f9a8889bd65225e43;p=openembedded.git

conf/distro/jlime-donkey.conf : GTK related versions remove, bugfix
* Removed all GTK, GLIB related stuff so we start bugtrack why osb-jscore
  doeesnt build.
* Added PREFERRED_PROVIDER for glibc-intermediate so it grabs 2.4.
  Had to set specific defines for both archs due to some bitbake bug when
  using {ARCH} in define line.
---

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index e668c3ce38..76e68fcc08 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -53,19 +53,13 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
 PREFERRED_VERSION_glibc = "2.4"
 PREFERRED_VERSION_glibc-intermediate = "2.4"
 
-
-#<>------------------------------------------------------------------>
-#<>Setting Preferred glib, dbus, db-native
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_glib-2.0-native = "2.6.5"
-PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.12.0"
-PREFERRED_VERSION_glib-1.2 = "1.2.10"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_dbus = "0.61"
-PREFERRED_VERSION_dbus-native = "0.61"
-PREFERRED_PROVIDER_dbus-glib = "dbus"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
+#<>----------------------------------------------------------------->
+#<>Patch for bitbake bug:
+#<>Due to bitbake not grabbing glibc 2.4  properly 
+#<>we need to override it to be sure. Do it for both supported archs
+#<>-----------------------------------------------------------------<
+PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
 
 #<>------------------------------------------------------------------>
@@ -109,17 +103,6 @@ OPIE_VERSION = "1.2.2"
 require conf/distro/include/preferred-opie-versions.inc
 
 
-#<>------------------------------------------------------------------>
-#<> Lets decide on a GPE versipns
-#<> And lets override GTK to something that builds
-#<>------------------------------------------------------------------<
-require conf/distro/include/preferred-gpe-versions-2.7.inc
-PREFERRED_VERSION_gtk+ = "2.8.16"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_cairo = "1.2.2"
-PREFERRED_VERSION_gtk-engines = "2.7.4"
-
-
 #<>------------------------------------------------------------------>
 #<> We want pcmciautils, not pcmcia-cs
 #<>------------------------------------------------------------------<