diff options
author | Graeme Gregory <dp@openmoko.hyboria> | 2008-10-16 15:38:09 +0100 |
---|---|---|
committer | Graeme Gregory <dp@openmoko.hyboria> | 2008-10-16 15:38:09 +0100 |
commit | 318a879dbf9b1eb7be921d94b1ad3abc486430ee (patch) | |
tree | a14abc4b987a29010d5d824c62863e5bd9855e39 /conf/distro | |
parent | 7d340cfc052acf1501e11c10826f8e8279593f9e (diff) | |
parent | a9ec52021c385ef43c5748a31b4523f3d613639f (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
-rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 4 | ||||
-rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 8 | ||||
-rw-r--r-- | conf/distro/include/preferred-xorg-versions.inc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 2ba21b20ad..4ee402fd59 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -22,13 +22,13 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION = "-O2" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_pn-glibc = "-O2" BUILD_OPTIMIZATION_sparc = "-O2" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 6a7f3d5213..518b2e3cfd 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -340,8 +340,8 @@ PREFERRED_VERSION_faad2 ?= "2.0" PREFERRED_VERSION_fakechroot ?= "2.5" PREFERRED_VERSION_fakechroot-native ?= "2.5" PREFERRED_VERSION_fakeconnect ?= "1.2.1" -PREFERRED_VERSION_fakeroot ?= "1.7.1" -PREFERRED_VERSION_fakeroot-native ?= "1.7.1" +PREFERRED_VERSION_fakeroot ?= "1.9.6" +PREFERRED_VERSION_fakeroot-native ?= "1.9.6" PREFERRED_VERSION_fam ?= "2.7.0" PREFERRED_VERSION_farsight ?= "0.1.5" PREFERRED_VERSION_fastcgi ?= "2.4.0" @@ -1092,8 +1092,8 @@ PREFERRED_VERSION_libxinerama ?= "1.0.2" PREFERRED_VERSION_libxine-x11 ?= "1.0" PREFERRED_VERSION_libxkbfile ?= "1.0.4" PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_libxml2 ?= "2.6.29" -PREFERRED_VERSION_libxml2-native ?= "2.6.29" +PREFERRED_VERSION_libxml2 ?= "2.7.2" +PREFERRED_VERSION_libxml2-native ?= "2.7.2" PREFERRED_VERSION_libxml-parser-perl ?= "2.34" PREFERRED_VERSION_libxml-parser-perl-native ?= "2.34" PREFERRED_VERSION_libxmu ?= "1.0.3" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index 05136138fc..ea99842fd6 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -15,9 +15,9 @@ PREFERRED_VERSION_gccmakedep ?= "1.0.2" PREFERRED_VERSION_glproto ?= "1.4.8" PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_inputproto ?= "1.4.2" -PREFERRED_VERSION_inputproto-native ?= "1.4.1" +PREFERRED_VERSION_inputproto-native ?= "1.4.2" PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_kbproto-native ?= "1.0.2" +PREFERRED_VERSION_kbproto-native ?= "1.0.3" PREFERRED_VERSION_libapplewm ?= "1.0.0" PREFERRED_VERSION_libdmx ?= "1.0.2" PREFERRED_VERSION_libfontenc ?= "1.0.4" |