packages/xerces-c/xerces-c_2.6.0.bb: Use configure directly instead of runConfigure

    To fix bug #1154 where CXX="ccache arm-linux-g++ ..." got mangled - thanks to
    getopt - into CXX=ccache. Using ./configure directly and setting CFLAGS,CXXFLAGS,
    LIBS and other variables we totally avoid this issue. Only one issue remains
    we have to set BUILDBITS and these are set to 32. We need a way to know how many
    bits our target has.

diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb
index 1fa986c6f4c1f4cdc5d3362adfa38942f7ebef00..b38842951a166a4fab4211a821e289c7206591de 100644 (file)
--- a/packages/xerces-c/xerces-c_2.6.0.bb
+++ b/packages/xerces-c/xerces-c_2.6.0.bb
@@ -5,32 +5,48 @@ PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 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 
+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
-# runConfigure is going to bust CC and CXX I bet
-        CC_SAVE="${CC}"
-        CXX_SAVE="${CXX}"
-       ./runConfigure -plinux -c${CC} -x${CXX} -minmem -nsocket -tnative -rpthread
-        CC="${CC_SAVE}"
-        CXX="${CXX_SAVE}"
-        oe_runmake
+    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}
+    oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR}
+    oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR}
 
-       cp -pPR include/xercesc ${STAGING_INCDIR}
+    cp -pPR include/xercesc ${STAGING_INCDIR}
 }
 
 do_install () {
-       oe_libinstall -C lib libxerces-c ${D}${libdir}
-       oe_libinstall -C lib libxerces-depdom ${D}${libdir}
+    oe_libinstall -C lib libxerces-c ${D}${libdir}
+    oe_libinstall -C lib libxerces-depdom ${D}${libdir}
 }