[oe-commits] org.oe.dev merge of '860bccc90a045f54a0fd143d4759959d43643350'
koen commit
oe at amethyst.openembedded.net
Sun May 18 12:03:44 UTC 2008
merge of '860bccc90a045f54a0fd143d4759959d43643350'
and 'd0e6322f95c05a9799955013d3c7dba65d4cc401'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: aca0d79fabb26001609032cfad6b513f42dc3604
ViewMTN: http://monotone.openembedded.org/revision/info/aca0d79fabb26001609032cfad6b513f42dc3604
Files:
1
classes/oestats-client.bbclass
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
Diffs:
#
# mt diff -r860bccc90a045f54a0fd143d4759959d43643350 -raca0d79fabb26001609032cfad6b513f42dc3604
#
#
#
# patch "classes/oestats-client.bbclass"
# from [a710c44a7f932fd458136ca8079856a4b2962a61]
# to [e73c7ea6f42f1cdac24bec988ca6b2b4cd1022b7]
#
============================================================
--- classes/oestats-client.bbclass a710c44a7f932fd458136ca8079856a4b2962a61
+++ classes/oestats-client.bbclass e73c7ea6f42f1cdac24bec988ca6b2b4cd1022b7
@@ -22,28 +22,37 @@ def oestats_send(server, action, vars =
import httplib, urllib
params = urllib.urlencode(vars)
- headers = {"Content-type": "application/x-www-form-urlencoded",
- "Accept": "text/plain"}
+ headers = {"Content-type": "application/x-www-form-urlencoded"}
conn = httplib.HTTPConnection(server)
conn.request("POST", action, params, 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: server error, disabling stats")
oestats_setid(d, id)
def oestats_stop(server, d, status):
@@ -51,6 +60,7 @@ 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, {
@@ -63,6 +73,9 @@ 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:
#
# mt diff -rd0e6322f95c05a9799955013d3c7dba65d4cc401 -raca0d79fabb26001609032cfad6b513f42dc3604
#
#
#
# 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]
#
============================================================
--- 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
More information about the Openembedded-commits
mailing list