From 96320328ecb8f2bdaaf1949a78aa462239192ea2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 12 Jan 2008 14:18:26 +0000 Subject: insane.bbclass: fix formatting of fatal include error --- classes/insane.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 840ebf6eff..97cf036dd9 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -464,7 +464,6 @@ python do_qa_configure() { os.path.join(root,"config.log") if "config.log" in files: if os.system(statement) == 0: - bb.fatal("This autoconf log indicates errors, it looked at \ - host includes. Rerun configure task after fixing this. \ - Path was '%s'" % root) + bb.fatal("""This autoconf log indicates errors, it looked at host includes. +Rerun configure task after fixing this. The path was '%s'""" % root) } -- cgit v1.2.3 From 292e12127c645974278f5be07416861e1955896c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 12 Jan 2008 14:19:41 +0000 Subject: xerces-c 2.8.0 add, remove non-working 2.6.0 and 2.7.0 --- packages/xerces-c/xerces-c_2.6.0.bb | 47 ------------------------------------- packages/xerces-c/xerces-c_2.7.0.bb | 47 ------------------------------------- packages/xerces-c/xerces-c_2.8.0.bb | 30 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 94 deletions(-) delete mode 100644 packages/xerces-c/xerces-c_2.6.0.bb delete mode 100644 packages/xerces-c/xerces-c_2.7.0.bb create mode 100644 packages/xerces-c/xerces-c_2.8.0.bb diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb deleted file mode 100644 index fe0677f54f..0000000000 --- a/packages/xerces-c/xerces-c_2.6.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Xerces-c xml" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "MIT" - -S = "${WORKDIR}/xerces-c-src_2_6_0" - -SRC_URI = "http://www.axint.net/apache/xml/xerces-c/xerces-c-src_2_6_0.tar.gz" - -inherit pkgconfig - - -# -# Warning: BITSTOBUILD will default to 32 bits -# -export TRANSCODER="NATIVE" -export MESSAGELOADER="INMEM" -export NETACCESSOR="Socket" -export THREADS="pthread" -export BITSTOBUILD="32" -export LIBS = " -lpthread " -CFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET " -CXXFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET " - -do_configure() { - export XERCESCROOT=${S} - cd src/xercesc - ./configure -} - -do_compile () { - export XERCESCROOT=${S} - cd src/xercesc - oe_runmake -} - -do_stage () { - oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR} - oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR} - - cp -pPR include/xercesc ${STAGING_INCDIR} -} - -do_install () { - oe_libinstall -C lib libxerces-c ${D}${libdir} - oe_libinstall -C lib libxerces-depdom ${D}${libdir} -} diff --git a/packages/xerces-c/xerces-c_2.7.0.bb b/packages/xerces-c/xerces-c_2.7.0.bb deleted file mode 100644 index 8fdab80180..0000000000 --- a/packages/xerces-c/xerces-c_2.7.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Xerces-c xml" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "MIT" - -S = "${WORKDIR}/xerces-c-src_2_7_0" - -SRC_URI = "http://www.axint.net/apache/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz" - -inherit pkgconfig - - -# -# Warning: BITSTOBUILD will default to 32 bits -# -export TRANSCODER="NATIVE" -export MESSAGELOADER="INMEM" -export NETACCESSOR="Socket" -export THREADS="pthread" -export BITSTOBUILD="32" -export LIBS = " -lpthread " -CFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET " -CXXFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET " - -do_configure() { - export XERCESCROOT=${S} - cd src/xercesc - ./configure -} - -do_compile () { - export XERCESCROOT=${S} - cd src/xercesc - oe_runmake -} - -do_stage () { - oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR} - oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR} - - cp -pPR include/xercesc ${STAGING_INCDIR} -} - -do_install () { - oe_libinstall -C lib libxerces-c ${D}${libdir} - oe_libinstall -C lib libxerces-depdom ${D}${libdir} -} diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb new file mode 100644 index 0000000000..9f911bdb4d --- /dev/null +++ b/packages/xerces-c/xerces-c_2.8.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Xerces-c is a validating xml parser written in C++" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz" +S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc" + +inherit pkgconfig + +CCACHE = "" +export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0" + +do_configure() { + ./runConfigure -plinux -c"${BUILD_CC}" -x"${BUILD_CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} +} + +do_compile() { + ${MAKE} +} + +do_stage () { + oe_libinstall -C ${XERCESCROOT}/lib libxerces-c ${STAGING_LIBDIR} + oe_libinstall -C ${XERCESCROOT}/lib libxerces-depdom ${STAGING_LIBDIR} + cp -pPR ${XERCESCROOT}/include/xercesc ${STAGING_INCDIR} +} + +do_install () { + ${MAKE} install +} -- cgit v1.2.3 From a517ea6a648846d845040be42b024666e6782915 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 12 Jan 2008 15:10:04 +0000 Subject: xerces-c 2.8.0 make it compile for the target architecture *cough* --- packages/xerces-c/xerces-c_2.8.0.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb index 9f911bdb4d..4f72e9dc77 100644 --- a/packages/xerces-c/xerces-c_2.8.0.bb +++ b/packages/xerces-c/xerces-c_2.8.0.bb @@ -1,18 +1,24 @@ DESCRIPTION = "Xerces-c is a validating xml parser written in C++" +HOMEPAGE = "http://xerces.apache.org/xerces-c/" SECTION = "libs" PRIORITY = "optional" LICENSE = "MIT" +PR = "r1" SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz" S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc" -inherit pkgconfig +inherit autotools pkgconfig CCACHE = "" export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0" +export cross_compiling = "yes" do_configure() { - ./runConfigure -plinux -c"${BUILD_CC}" -x"${BUILD_CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} + ./runConfigure -plinux -c"${CC}" -x"${CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} \ + -C--build=${BUILD_SYS} \ + -C--host=${HOST_SYS} \ + -C--target=${TARGET_SYS} \ } do_compile() { -- cgit v1.2.3 From 3ad50ef778fcdc29cb5fd48109e95d7a8a73fab8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 12 Jan 2008 15:22:07 +0000 Subject: add dtn, from the Delay Tolerant Networking Research Group yes, this includes python-dtn (of course :) --- packages/dtnrg/.mtn2git_empty | 0 packages/dtnrg/dtn_2.5.0.bb | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 packages/dtnrg/.mtn2git_empty create mode 100644 packages/dtnrg/dtn_2.5.0.bb diff --git a/packages/dtnrg/.mtn2git_empty b/packages/dtnrg/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb new file mode 100644 index 0000000000..a1111f18e7 --- /dev/null +++ b/packages/dtnrg/dtn_2.5.0.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "Delay Tolerant Networking Package" +HOMEPAGE = "http://www.dtnrg.org/wiki" +SECTION = "libs" +DEPENDS = "db openssl python-native xerces-c" +LICENSE = "Apache" +SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz" + +inherit autotools + +EXTRA_OECONF = "\ + --with-python=${STAGING_BINDIR_NATIVE}/python \ + --with-db=${STAGING_DIR} \ + --with-tcl=${STAGING_DIR} \ + --without-google-perftools \ + --without-bluez \ + --without-bonjour \ + --with-expat=${STAGING_DIR} \ + --with-xerces-c=${STAGING_DIR} \ + --without-tclreadline \ + --with-zlib=${STAGING_DIR} \ + --without-xsd-tool \ + --with-db=${STAGING_DIR} \ + --enable-ecl \ + --enable-edp \ + --without-mysql \ + --without-postgres \ + --with-openssl=${STAGING_DIR} \ +" + +def python_dir(d): + import os, bb + staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) + if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" + if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" + if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + +PYTHON_DIR = "${@python_dir(d)}" + +export BUILD_SYS +export HOST_SYS + +do_configure_prepend() { + for i in aclocal/*.ac oasys/aclocal/*.ac; do + install -m 0644 $i ${STAGING_DATADIR}/aclocal/`basename $i`.m4 + done + autotools_do_configure +} + +do_install_append() { + cd applib/python + INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} +} + +PACKAGES += "${PN}-python" +FILES_${PN}-python = "${libdir}/${PYTHON_DIR}" +RDEPENDS_${PN}-python = "python-core" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" -- cgit v1.2.3