Patchwork [meta-oe] libtinyxml: Add native support and use relative paths

login
register
mail settings
Submitter Stefan Herbrechtsmeier
Date March 14, 2013, 4:45 p.m.
Message ID <1363279557-5861-1-git-send-email-stefan@herbrechtsmeier.net>
Download mbox | patch
Permalink /patch/46179/
State Accepted, archived
Commit 19eb91d66d5ec899a781a14f3b9b50469d741d89
Headers show

Comments

Stefan Herbrechtsmeier - March 14, 2013, 4:45 p.m.
Replace CXXFLAGS += "-fPIC" with EXTRA_CXXFLAGS to allow native
build and use relative paths to simplify recipe.

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
---
 .../recipes-support/libtinyxml/libtinyxml_2.6.2.bb |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
Martin Jansa - March 22, 2013, 9:22 a.m.
On Thu, Mar 14, 2013 at 05:45:57PM +0100, Stefan Herbrechtsmeier wrote:
> Replace CXXFLAGS += "-fPIC" with EXTRA_CXXFLAGS to allow native
> build and use relative paths to simplify recipe.

Applied, thanks!

> 
> Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
> ---
>  .../recipes-support/libtinyxml/libtinyxml_2.6.2.bb |   18 ++++++++++--------
>  1 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
> index fdadebd..8670fac 100644
> --- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
> +++ b/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"
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
index fdadebd..8670fac 100644
--- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
+++ b/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"