From 3f5e29951787fe4ad79cc4f2fb7cfbbe212fca57 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Thu, 14 Mar 2013 16:45:57 +0000 Subject: [PATCH] libtinyxml: Add native support and use relative paths Replace CXXFLAGS += "-fPIC" with EXTRA_CXXFLAGS to allow native build and use relative paths to simplify recipe. (From meta-openembedded rev: 19eb91d66d5ec899a781a14f3b9b50469d741d89) Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../recipes-support/libtinyxml/libtinyxml_2.6.2.bb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb index fdadebd..8670fac 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb @@ -16,20 +16,21 @@ SRC_URI[sha256sum] = "15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062 S = "${WORKDIR}/tinyxml" -CXXFLAGS += "-fPIC" +EXTRA_CXXFLAGS = "-I. -fPIC" do_compile() { - ${CXX} ${CXXFLAGS} -I${S} -c -o ${S}/tinyxml.o ${S}/tinyxml.cpp - ${CXX} ${CXXFLAGS} -I${S} -c -o ${S}/tinyxmlerror.o ${S}/tinyxmlerror.cpp - ${CXX} ${CXXFLAGS} -I${S} -c -o ${S}/tinyxmlparser.o ${S}/tinyxmlparser.cpp + ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o tinyxml.o tinyxml.cpp + ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o tinyxmlerror.o tinyxmlerror.cpp + ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o tinyxmlparser.o tinyxmlparser.cpp ${CXX} ${CXXFLAGS} \ -shared \ -Wl,-soname,libtinyxml.so.${PV} \ - -o ${S}/libtinyxml.so.${PV} \ + -o libtinyxml.so.${PV} \ ${LDFLAGS} \ - ${S}/tinyxml.o \ - ${S}/tinyxmlparser.o \ - ${S}/tinyxmlerror.o + tinyxml.o \ + tinyxmlparser.o \ + tinyxmlerror.o + } do_install() { @@ -41,3 +42,4 @@ do_install() { install -m 0644 ${S}/tinyxml.h ${D}${includedir} } +BBCLASSEXTEND += "native" -- 2.7.4