diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-04-08 12:07:43 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-04-08 12:07:43 +0000 |
| commit | 785baaa2d0432f753010778a51b7914618af9989 (patch) | |
| tree | d7661effcea1008b3aef9513118dc9da2b2d8e21 /conf | |
| parent | 40d4d8f4d9ab5771b2e9dff13b7150e9968e14c2 (diff) | |
| parent | f77305366a560bd673633ee926ab20bfb3eceb91 (diff) | |
merge of '559b63acfed0420f839e535ffad26766df66437a'
and 'c8122b4f0e7a0350bf0208abe44a4d7fd4c8828b'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/chinook-compat.conf | 8 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index e89d2185a7..2e8688b263 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -61,7 +61,9 @@ PREFERRED_VERSION_binutils-cross = "2.18" PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2" PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2" +PREFERRED_VERSION_gcc-cross-initial = "4.1.1" + +#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2" # Use recent enough version of the headers to let HAL build successfully. PREFERRED_VERSION_linux-libc-headers = "2.6.20" @@ -165,7 +167,7 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3" PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_VERSION_classpath = "0.97" +PREFERRED_VERSION_classpath = "0.97.1" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon" PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5" @@ -200,3 +202,5 @@ PKG_bluez-libs = "libbluetooth2" PKG_osso-ic-oss = "osso-ic" PKG_libconic = "libconic0" + +PKG_libgcc = "libgcc1" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index df0a21a3e4..1957500a02 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080330" +EFL_SRCDATE = "20080409" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9f478f7963..d798b23d84 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -146,8 +146,9 @@ SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "88" SRCREV_pn-pyneog ?= "88" SRCREV_pn-python-formencode = "3148" -SRCREV_pn-python-gsmd = "127" +SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" +SRCREV_pn-python-pyrtc = "152" SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" |