[oe-commits] org.oe.dev explicit merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
Laibsch commit
oe at amethyst.openembedded.net
Sun May 18 19:59:45 UTC 2008
explicit merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
and '94a69c171834b89089886081d5bd9f0e42d880f0'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 2a95914087586c7f511061dd7404c0f44fc9ce24
ViewMTN: http://monotone.openembedded.org/revision/info/2a95914087586c7f511061dd7404c0f44fc9ce24
Files:
1
packages/keyring/keyring-0.6.8
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/dropbear/dropbear-early_1.0.bb
packages/dropbear/dropbear_0.49.bb
packages/dropbear/dropbear_0.50.bb
packages/keyring/keyring_0.6.8.bb
packages/dropbear/dropbear/scp-argument-fix.patch
packages/dropbear/dropbear-0.49/scp-argument-fix.patch
packages/gcc/gcc-csl-arm-2007q3
packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
packages/gcc/gcc-cross_csl-arm-2007q3.bb
packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch
packages/gcc/gcc-csl-arm-2007q3.inc
packages/gcc/gcc_csl-arm-2007q3.bb
classes/oestats-client.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
conf/machine/include/tune-cortexa8.inc
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools_0.6c6.bb
Diffs:
#
# mt diff -r8c79c14e519c2da015b828d88899e0af791e9da9 -r2a95914087586c7f511061dd7404c0f44fc9ce24
#
#
#
# add_dir "packages/keyring/keyring-0.6.8"
#
# add_file "packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch"
# content [20aad83748060bdeaff7f817d93e61f7f3d10d42]
#
# patch "packages/dropbear/dropbear-early_1.0.bb"
# from [5b7702b9d74427e400988330fbd7c6fcff176371]
# to [f1e7db2a9ec4fc0155567720a008f3158be5d187]
#
# patch "packages/dropbear/dropbear_0.49.bb"
# from [251634540a152574b870f74866d793a0dedefae3]
# to [78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77]
#
# patch "packages/dropbear/dropbear_0.50.bb"
# from [1f1e5b54696006b7f8484bd48dff9fa684992830]
# to [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
#
# patch "packages/keyring/keyring_0.6.8.bb"
# from [2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03]
# to [e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe]
#
============================================================
--- packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch 20aad83748060bdeaff7f817d93e61f7f3d10d42
+++ packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch 20aad83748060bdeaff7f817d93e61f7f3d10d42
@@ -0,0 +1,93 @@
+diff -Naru Keyring.orig/accountlist.cpp Keyring/accountlist.cpp
+--- Keyring.orig/accountlist.cpp 2002-09-29 17:24:09.000000000 +0200
++++ Keyring/accountlist.cpp 2007-06-05 15:46:59.000000000 +0200
+@@ -314,7 +314,7 @@
+ */
+ void AccountList::resetTimer(){
+ mSeconds=mTimerStart;
+- mStartTime = time(NULL);
++ mStartTime = (time_t*)time(NULL);
+ wLCD->display(mSeconds);
+ }
+
+@@ -390,20 +390,20 @@
+ //if so and it has expired, lock keyring.
+ if(mTimerViewingAC && mTimerEnabled){
+ //Timer has expired
+- if((time(NULL)-mStartTime) > mTimerStart){
++ if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ lock();
+ } else {
+ //Timer needs to be updated
+ time_t diff=time(NULL)-viewtime;
+ mSeconds=mSeconds-diff;
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ mUpdateTimer->start(500,false);
+ wLCD->display(mSeconds);
+ }
+ } else {
+ if(mTimerEnabled){
+ mUpdateTimer->start(500,false);
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ }
+ }
+
+@@ -432,7 +432,7 @@
+ if(mTimerEnabled)
+ mUpdateTimer->start(500,false);
+ mSeconds=mTimerStart;
+- mStartTime = time(NULL);
++ mStartTime = (time_t*)time(NULL);
+ updateCountDown();
+
+ //Let's be a bastard and bitch if the
+@@ -463,11 +463,11 @@
+ void AccountList::updateCountDown(){
+ wLCD->display(mSeconds);
+ if(mSeconds==0 ||
+- (((time(NULL)-mStartTime) > mTimerStart) && mTimerPowerOff)){
++ (((time(NULL)-(time_t)mStartTime) > mTimerStart) && mTimerPowerOff)){
+ lock();
+ return;
+ }
+- mSeconds=mTimerStart-(time(NULL)-mStartTime);
++ mSeconds=mTimerStart-(time(NULL)-(time_t)mStartTime);
+ }
+
+ void AccountList::selectionChanged(QListViewItem *item){
+@@ -548,20 +548,20 @@
+ //if so and it has expired, lock keyring.
+ if(mTimerViewingAC && mTimerEnabled){
+ //Timer has expired
+- if((time(NULL)-mStartTime) > mTimerStart){
++ if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ lock();
+ } else {
+ //Timer needs to be updated
+- time_t diff=time(NULL)-viewtime;
++ time_t diff = time(NULL)-(time_t)viewtime;
+ mSeconds=mSeconds-diff;
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ mUpdateTimer->start(500,false);
+ wLCD->display(mSeconds);
+ }
+ } else {
+ if(mTimerEnabled){
+ mUpdateTimer->start(500,false);
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ }
+ }
+ delete qd;
+@@ -627,7 +627,7 @@
+
+ if(mTimerEnabled){
+ mUpdateTimer->start(500,false);
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ }
+
+ showAccountList();
============================================================
--- packages/dropbear/dropbear-early_1.0.bb 5b7702b9d74427e400988330fbd7c6fcff176371
+++ packages/dropbear/dropbear-early_1.0.bb f1e7db2a9ec4fc0155567720a008f3158be5d187
@@ -1,7 +1,7 @@ SECTION = "devel"
DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
SECTION = "devel"
-PR = "r2"
RDEPENDS = "dropbear"
+PR = "r3"
SRC_URI = "file://dropbear-early"
============================================================
--- packages/dropbear/dropbear_0.49.bb 251634540a152574b870f74866d793a0dedefae3
+++ packages/dropbear/dropbear_0.49.bb 78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77
@@ -1,5 +1,5 @@
+require dropbear.inc
+
PR = "r2"
+SRC_URI += "file://scp-argument-fix.patch;patch=1"
-require dropbear.inc
-SRC_URI += "file://scp-argument-fix.patch;patch=1 \
- "
============================================================
--- packages/dropbear/dropbear_0.50.bb 1f1e5b54696006b7f8484bd48dff9fa684992830
+++ packages/dropbear/dropbear_0.50.bb 61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
@@ -1,6 +1,6 @@
-PR = "r0"
+require dropbear.inc
-require dropbear.inc
+PR = "r1"
# testing
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/keyring/keyring_0.6.8.bb 2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03
+++ packages/keyring/keyring_0.6.8.bb e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe
@@ -5,7 +5,8 @@ PR = "r2"
DEPENDS = "gdbm"
PR = "r2"
-SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz"
+SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \
+ file://keyring-0.6.8-datatype.patch;patch=1"
S = "${WORKDIR}/Keyring"
inherit palmtop
#
# mt diff -r94a69c171834b89089886081d5bd9f0e42d880f0 -r2a95914087586c7f511061dd7404c0f44fc9ce24
#
#
#
# rename "packages/dropbear/dropbear/scp-argument-fix.patch"
# to "packages/dropbear/dropbear-0.49/scp-argument-fix.patch"
#
# add_dir "packages/gcc/gcc-csl-arm-2007q3"
#
# add_file "packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb"
# content [4acf01cc481b727325c6077882c195b4f1572001]
#
# add_file "packages/gcc/gcc-cross_csl-arm-2007q3.bb"
# content [f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0]
#
# add_file "packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch"
# content [ae26bd559a50cddae7e3e2732e8821389464d64b]
#
# add_file "packages/gcc/gcc-csl-arm-2007q3.inc"
# content [01e125daae24e6a2f2f71eb12b6d2232b0ada01a]
#
# add_file "packages/gcc/gcc_csl-arm-2007q3.bb"
# content [d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f]
#
# patch "classes/oestats-client.bbclass"
# from [a710c44a7f932fd458136ca8079856a4b2962a61]
# to [c171db6462110869cb93b9aeaddec289573fca56]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [dface09802ce45bdb21c822c2e46b480f3369810]
# to [4b22a5418909757b3c14e67557228138743a303e]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [c49fa1468b1a41c309505f099d320a78a592a8b8]
# to [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
#
# patch "conf/machine/include/tune-cortexa8.inc"
# from [8ce9346cd012a0659a0967b2e43edcfc2dfaf921]
# to [ffd911180ea7eb03d473826a023a54d88a219438]
#
# patch "packages/python/python-setuptools-native_0.6c6.bb"
# from [37e35eebe4105610cad978ad7a92f12a2b9095d1]
# to [98f58e21bf03997cb61c8459da61b888c73364f9]
#
# patch "packages/python/python-setuptools_0.6c6.bb"
# from [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
# to [84dd67b8d39b269a732a02fdc2b2b08af8516af9]
#
============================================================
--- packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb 4acf01cc481b727325c6077882c195b4f1572001
+++ packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb 4acf01cc481b727325c6077882c195b4f1572001
@@ -0,0 +1,12 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+
+S = "${WORKDIR}/gcc-4.2"
+
+EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
+
+# Hack till we fix *libc properly
+do_stage_append() {
+ ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
============================================================
--- packages/gcc/gcc-cross_csl-arm-2007q3.bb f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0
+++ packages/gcc/gcc-cross_csl-arm-2007q3.bb f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0
@@ -0,0 +1,26 @@
+PR = "r0"
+
+require gcc-csl-arm-2007q3.inc
+require gcc-cross4.inc
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
+CFLAGS = ""
+CXXFLAGS = ""
+LDFLAGS = ""
+
+# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
+do_compile_prepend() {
+ ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/
+ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
+
+}
+
+ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}"
============================================================
--- packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch ae26bd559a50cddae7e3e2732e8821389464d64b
+++ packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch ae26bd559a50cddae7e3e2732e8821389464d64b
@@ -0,0 +1,22 @@
+--- /tmp/configure 2008-05-18 12:57:11.378648834 +0200
++++ gcc-4.2/configure 2008-05-18 12:58:38.309478684 +0200
+@@ -3776,7 +3776,7 @@
+ # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
+--- /tmp/configure.in 2008-05-18 12:57:32.665314708 +0200
++++ gcc-4.2/configure.in 2008-05-18 12:59:03.000000000 +0200
+@@ -2271,7 +2271,7 @@
+ # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
============================================================
--- packages/gcc/gcc-csl-arm-2007q3.inc 01e125daae24e6a2f2f71eb12b6d2232b0ada01a
+++ packages/gcc/gcc-csl-arm-2007q3.inc 01e125daae24e6a2f2f71eb12b6d2232b0ada01a
@@ -0,0 +1,51 @@
+require gcc-common.inc
+
+BINV = "4.2.1"
+PV = "4.2.1+csl-arm-2007q3-53"
+
+FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm"
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2 \
+ file://gcc-new-makeinfo.patch;patch=1 \
+# file://100-uclibc-conf.patch;patch=1 \
+# file://103-uclibc-conf-noupstream.patch;patch=1 \
+# file://200-uclibc-locale.patch;patch=1 \
+# file://203-uclibc-locale-no__x.patch;patch=1 \
+# file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+# file://205-uclibc-locale-update.patch;patch=1 \
+# file://300-libstdc++-pic.patch;patch=1 \
+# file://302-c99-snprintf.patch;patch=1 \
+# file://303-c99-complex-ugly-hack.patch;patch=1 \
+# file://304-index_macro.patch;patch=1 \
+# file://305-libmudflap-susv3-legacy.patch;patch=1 \
+# file://306-libstdc++-namespace.patch;patch=1 \
+# file://307-locale_facets.patch;patch=1 \
+# file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+# file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://gcc41-configure.in.patch;patch=1 \
+ file://arm-nolibfloat.patch;patch=1 \
+ file://arm-softfloat.patch;patch=1 \
+ file://zecke-xgcc-cpp.patch;patch=1 \
+# file://gfortran.patch;patch=1 \
+# file://fortran-static-linking.patch;patch=1 \
+# file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
+# file://gcc-new-makeinfo.patch;patch=1 \
+"
+
+
+S = "${WORKDIR}/gcc-4.2"
+
+do_unpack2() {
+ cd ${WORKDIR}
+ tar -xvjf ./arm-2007q3-53-arm-none-eabi/gcc-2007q3-53.tar.bz2
+}
+
+# Language Overrides
+FORTRAN = ""
+#FORTRAN_linux-gnueabi = ",fortran"
+#JAVA = ",java"
+
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+ARM_INSTRUCTION_SET = "arm"
+
+addtask unpack2 after do_unpack before do_patch
============================================================
--- packages/gcc/gcc_csl-arm-2007q3.bb d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f
+++ packages/gcc/gcc_csl-arm-2007q3.bb d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f
@@ -0,0 +1,5 @@
+PR = "r0"
+
+require gcc-${PV}.inc
+require gcc-configure-target.inc
+require gcc-package-target.inc
============================================================
--- classes/oestats-client.bbclass a710c44a7f932fd458136ca8079856a4b2962a61
+++ classes/oestats-client.bbclass c171db6462110869cb93b9aeaddec289573fca56
@@ -19,31 +19,58 @@ def oestats_send(server, action, vars =
return f.read()
def oestats_send(server, action, vars = {}):
- import httplib, urllib
+ import httplib
- params = urllib.urlencode(vars)
- headers = {"Content-type": "application/x-www-form-urlencoded",
- "Accept": "text/plain"}
+ # build body
+ output = []
+ bound = '----------ThIs_Is_tHe_bouNdaRY_$'
+ for key in vars:
+ assert vars[key]
+ output.append('--' + bound)
+ output.append('Content-Disposition: form-data; name="%s"' % key)
+ output.append('')
+ output.append(vars[key])
+ output.append('--' + bound + '--')
+ output.append('')
+ body = "\r\n".join(output)
+
+ # build headers
+ headers = {
+ "User-agent": "oestats-client/0.1",
+ "Content-type": "multipart/form-data; boundary=%s" % bound,
+ "Content-length": str(len(body))}
+
+ # send request
conn = httplib.HTTPConnection(server)
- conn.request("POST", action, params, headers)
+ conn.request("POST", action, body, headers)
response = conn.getresponse()
+ data = response.read()
conn.close()
- return response
+ return data
def oestats_start(server, builder, d):
import bb
import os.path
+ import re
# send report
- response = oestats_send(server, "/builds/start/", {
- 'builder': builder,
- 'revision': bb.data.getVar('METADATA_REVISION', d, True),
- 'machine': bb.data.getVar('MACHINE', d, True),
- 'distro': bb.data.getVar('DISTRO', d, True),
- })
- id = response.read()
+ id = ""
+ try:
+ data = oestats_send(server, "/builds/start/", {
+ 'builder': builder,
+ 'revision': bb.data.getVar('METADATA_REVISION', d, True),
+ 'machine': bb.data.getVar('MACHINE', d, True),
+ 'distro': bb.data.getVar('DISTRO', d, True),
+ })
+ if re.match("^\d+$", data): id=data
+ except:
+ pass
# save the build id
+ if id:
+ bb.note("oestats: build %s" % id)
+ else:
+ bb.note("oestats: error starting build, disabling stats")
oestats_setid(d, id)
def oestats_stop(server, d, status):
@@ -51,11 +78,15 @@ def oestats_stop(server, d, status):
# retrieve build id
id = oestats_getid(d)
+ if not id: return
# send report
- response = oestats_send(server, "/builds/stop/%s/" % id, {
- 'status': status,
- })
+ try:
+ response = oestats_send(server, "/builds/stop/%s/" % id, {
+ 'status': status,
+ })
+ except:
+ bb.note("oestats: error stopping build")
def oestats_task(server, d, task, status):
import bb
@@ -63,20 +94,27 @@ def oestats_task(server, d, task, status
# retrieve build id
id = oestats_getid(d)
+ if not id: return
+
+ # calculate build time
try:
elapsed = time.time() - float(bb.data.getVar('OESTATS_STAMP', d, True))
except:
elapsed = 0
# send report
- response = oestats_send(server, "/builds/task/%s/" % id, {
- 'package': bb.data.getVar('PN', d, True),
- 'version': bb.data.getVar('PV', d, True),
- 'revision': bb.data.getVar('PR', d, True),
- 'task': task,
- 'status': status,
- 'time': elapsed,
- })
+ try:
+ response = oestats_send(server, "/builds/task/%s/" % id, {
+ 'package': bb.data.getVar('PN', d, True),
+ 'version': bb.data.getVar('PV', d, True),
+ 'revision': bb.data.getVar('PR', d, True),
+ 'task': task,
+ 'status': status,
+ 'time': str(elapsed),
+ })
+ except:
+ bb.note("oestats: error sending task, disabling stats")
+ oestats_setid(d, "")
addhandler oestats_eventhandler
python oestats_eventhandler () {
============================================================
--- conf/distro/angstrom-2008.1.conf dface09802ce45bdb21c822c2e46b480f3369810
+++ conf/distro/angstrom-2008.1.conf 4b22a5418909757b3c14e67557228138743a303e
@@ -85,42 +85,30 @@ PREFERRED_PROVIDER_xserver ?= "
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
#powerpc needs additional patches to gcc
-PREFERRED_VERSION_gcc_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
+#for proper NEON support we need a CSL toolchain
+ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
-PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
+#avr32 only has support for gcc 4.2.2
+ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
-# GCC 4.3.0 is the first release with armv7-* support
-PREFERRED_VERSION_gcc_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross-sdk_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross-initial_armv7a = "4.2.3+csl-arm-2008q1-126"
+#Everybody else can just use this:
+ANGSTROM_GCC_VERSION ?= "4.2.2"
-PREFERRED_VERSION_gcc ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
+PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE
-PREFERRED_VERSION_gcc_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2"
+#avr32 only has patches for binutils 2.17 in OE
PREFERRED_VERSION_binutils_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
============================================================
--- conf/distro/include/angstrom-glibc.inc c49fa1468b1a41c309505f099d320a78a592a8b8
+++ conf/distro/include/angstrom-glibc.inc 64060b7ace4591e34cd8206bb5cd3ba77c6554d4
@@ -24,17 +24,11 @@ FULL_OPTIMIZATION = "-fexpensive-optimiz
FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -frename-registers -fomit-frame-pointer -O2"
-TARGET_CC_ARCH_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp "
-
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-FULL_OPTIMIZATION_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp "
-CFLAGS_pn-glibc_armv7a = " -fexpensive-optimizations -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp"
-
BUILD_OPTIMIZATION = "-Os"
BUILD_OPTIMIZATION_pn-perl = "-O1"
BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"
============================================================
--- conf/machine/include/tune-cortexa8.inc 8ce9346cd012a0659a0967b2e43edcfc2dfaf921
+++ conf/machine/include/tune-cortexa8.inc ffd911180ea7eb03d473826a023a54d88a219438
@@ -3,6 +3,6 @@
# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
FEED_ARCH = "armv7a"
PACKAGE_ARCH = "armv7a"
============================================================
--- packages/pyth%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list