Skip to contentSkip to conversation

libtinyxml2: Add packageconfig support

PATCH In review Khem Raj 2 participants 3 messages Mar 31, 2016

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 libtinyxml2: Add packageconfig support

Some package enquire using pkgconfig

Change-Id I4b7ac35930caf25b8ca04c3f5b34a193d4ed4a3d
---
 .../libtinyxml2/libtinyxml2/libtinyxml2.pc         | 10 +++++++++
 .../recipes-support/libtinyxml2/libtinyxml2_git.bb | 26 +++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 meta-oe/recipes-support/libtinyxml2/libtinyxml2/libtinyxml2.pc
meta-oe/recipes-support/libtinyxml2/libtinyxml2/libtinyxml2.pc new file +10 -0
new file mode 100644
index 0000000..ef155a1
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml2
+Description: simple, small, C++ XML parser
+Version: 2.2.0
+Libs: -L${libdir} -ltinyxml2
+Cflags: -I${includedir}
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +16 -10
index 6ca6f7c..e1760e4 100644
@@ -6,9 +6,13 @@ SECTION = "libs"
 
 SRCREV = "d211bb13512cf4edb408e2c4badbcf4100ce0fd0"
 
-PV = "2.2.0+git${SRCPV}"
+XML2VER = "2.2.0"
 
-SRC_URI = "git://github.com/leethomason/tinyxml2.git"
+PV = "${XML2VER}+git${SRCPV}"
+
+SRC_URI = "git://github.com/leethomason/tinyxml2.git \
+           file://libtinyxml2.pc \
+          "
 
 S = "${WORKDIR}/git"
 
@@ -17,21 +21,23 @@ EXTRA_CXXFLAGS = "-I. -fPIC"
 do_compile() {
     ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o tinyxml2.o tinyxml2.cpp
     ${CXX} ${CXXFLAGS} \
-            -shared \
-            -Wl,-soname,libtinyxml2.so.${PV} \
-            -o libtinyxml2.so.${PV} \
-            ${LDFLAGS} \
-            tinyxml2.o
+        -shared \
+        -Wl,-soname,libtinyxml2.so.${XML2VER} \
+        -o libtinyxml2.so.${XML2VER} \
+        ${LDFLAGS} \
+        tinyxml2.o
+
 }
 
 do_install() {
     install -d ${D}${libdir}
-    install -m 0755 ${S}/libtinyxml2.so.${PV} ${D}${libdir}
-    ln -sf libtinyxml2.so.${PV} ${D}${libdir}/libtinyxml2.so
+    install -m 0644 ${S}/libtinyxml2.so.${XML2VER} ${D}${libdir}
+    ln -sf libtinyxml2.so.${XML2VER} ${D}${libdir}/libtinyxml2.so
+    ln -sf libtinyxml2.so.${XML2VER} ${D}${libdir}/libtinyxml2.so.2
 
     install -d ${D}${includedir}
     install -m 0644 ${S}/tinyxml2.h ${D}${includedir}
+    install -Dm644 ${WORKDIR}/libtinyxml2.pc ${D}${libdir}/pkgconfig/libtinyxml2.pc
 }
 
 BBCLASSEXTEND += "native"
-
Signature · 1 line
1.9.1
#1 lore raw
Quoted 60 lines · Khem Raj

Some package enquire using pkgconfig

Change-Id I4b7ac35930caf25b8ca04c3f5b34a193d4ed4a3d
---
 .../libtinyxml2/libtinyxml2/libtinyxml2.pc         | 10 +++++++++
 .../recipes-support/libtinyxml2/libtinyxml2_git.bb | 26 +++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 meta-oe/recipes-support/libtinyxml2/libtinyxml2/libtinyxml2.pc
meta-oe/recipes-support/libtinyxml2/libtinyxml2/libtinyxml2.pc new file +10 -0
new file mode 100644
index 0000000..ef155a1
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml2
+Description: simple, small, C++ XML parser
+Version: 2.2.0
+Libs: -L${libdir} -ltinyxml2
+Cflags: -I${includedir}
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +11 -7
index 6ca6f7c..e1760e4 100644
@@ -6,9 +6,13 @@ SECTION = "libs"
 
 SRCREV = "d211bb13512cf4edb408e2c4badbcf4100ce0fd0"
 
-PV = "2.2.0+git${SRCPV}"
+XML2VER = "2.2.0"
 
-SRC_URI = "git://github.com/leethomason/tinyxml2.git"
+PV = "${XML2VER}+git${SRCPV}"
+
+SRC_URI = "git://github.com/leethomason/tinyxml2.git \
+           file://libtinyxml2.pc \
+          "
 
 S = "${WORKDIR}/git"
 
@@ -17,21 +21,23 @@ EXTRA_CXXFLAGS = "-I. -fPIC"
 do_compile() {
     ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o tinyxml2.o tinyxml2.cpp
     ${CXX} ${CXXFLAGS} \
-            -shared \
-            -Wl,-soname,libtinyxml2.so.${PV} \
-            -o libtinyxml2.so.${PV} \
-            ${LDFLAGS} \
-            tinyxml2.o
+        -shared \
+        -Wl,-soname,libtinyxml2.so.${XML2VER} \
+        -o libtinyxml2.so.${XML2VER} \
+        ${LDFLAGS} \
+        tinyxml2.o

meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb EXTRA_CXXFLAGS = "-I. -fPIC" · line 36

Quoted 10 lines
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +4 -2
+
 }
 
 do_install() {
     install -d ${D}${libdir}
-    install -m 0755 ${S}/libtinyxml2.so.${PV} ${D}${libdir}
-    ln -sf libtinyxml2.so.${PV} ${D}${libdir}/libtinyxml2.so
+    install -m 0644 ${S}/libtinyxml2.so.${XML2VER} ${D}${libdir}
+    ln -sf libtinyxml2.so.${XML2VER} ${D}${libdir}/libtinyxml2.so
+    ln -sf libtinyxml2.so.${XML2VER} ${D}${libdir}/libtinyxml2.so.2

Either set soname to libtinyxml2.so.2 or drop the libtinyxml2.so.2 symlink.

Quoted 16 lines
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +1 -2
     install -d ${D}${includedir}
     install -m 0644 ${S}/tinyxml2.h ${D}${includedir}
+    install -Dm644 ${WORKDIR}/libtinyxml2.pc ${D}${libdir}/pkgconfig/libtinyxml2.pc
 }
 
 BBCLASSEXTEND += "native"
-
--

1.9.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 64 lines · Andre McCurdy
Quoted 63 lines · Khem Raj

Some package enquire using pkgconfig

Change-Id I4b7ac35930caf25b8ca04c3f5b34a193d4ed4a3d
---
 .../libtinyxml2/libtinyxml2/libtinyxml2.pc         | 10 +++++++++
 .../recipes-support/libtinyxml2/libtinyxml2_git.bb | 26 +++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 meta-oe/recipes-support/libtinyxml2/libtinyxml2/libtinyxml2.pc
meta-oe/recipes-support/libtinyxml2/libtinyxml2/libtinyxml2.pc new file +10 -0
new file mode 100644
index 0000000..ef155a1
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml2
+Description: simple, small, C++ XML parser
+Version: 2.2.0
+Libs: -L${libdir} -ltinyxml2
+Cflags: -I${includedir}
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +12 -7
index 6ca6f7c..e1760e4 100644
@@ -6,9 +6,13 @@ SECTION = "libs"
 
 SRCREV = "d211bb13512cf4edb408e2c4badbcf4100ce0fd0"
 
-PV = "2.2.0+git${SRCPV}"
+XML2VER = "2.2.0"
 
-SRC_URI = "git://github.com/leethomason/tinyxml2.git"
+PV = "${XML2VER}+git${SRCPV}"
+
+SRC_URI = "git://github.com/leethomason/tinyxml2.git \
+           file://libtinyxml2.pc \
+          "
 
 S = "${WORKDIR}/git"
 
@@ -17,21 +21,23 @@ EXTRA_CXXFLAGS = "-I. -fPIC"
 do_compile() {
     ${CXX} ${CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o tinyxml2.o tinyxml2.cpp
     ${CXX} ${CXXFLAGS} \
-            -shared \
-            -Wl,-soname,libtinyxml2.so.${PV} \
-            -o libtinyxml2.so.${PV} \
-            ${LDFLAGS} \
-            tinyxml2.o
+        -shared \
+        -Wl,-soname,libtinyxml2.so.${XML2VER} \
+        -o libtinyxml2.so.${XML2VER} \
+        ${LDFLAGS} \
+        tinyxml2.o
+
 }
 
Quoted 9 lines

meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb EXTRA_CXXFLAGS = "-I. -fPIC" · line 36

Quoted 7 lines
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +3 -2
 do_install() {
     install -d ${D}${libdir}
-    install -m 0755 ${S}/libtinyxml2.so.${PV} ${D}${libdir}
-    ln -sf libtinyxml2.so.${PV} ${D}${libdir}/libtinyxml2.so
+    install -m 0644 ${S}/libtinyxml2.so.${XML2VER} ${D}${libdir}
+    ln -sf libtinyxml2.so.${XML2VER} ${D}${libdir}/libtinyxml2.so
+    ln -sf libtinyxml2.so.${XML2VER} ${D}${libdir}/libtinyxml2.so.2

Either set soname to libtinyxml2.so.2 or drop the libtinyxml2.so.2 symlink.

Or even better, drop all the custom tasks and just inherit cmake. It looks like you'll get correct library versioning and a pkgconfig file for free :-)

Quoted 16 lines
Quoted 16 lines
meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb +1 -2
     install -d ${D}${includedir}
     install -m 0644 ${S}/tinyxml2.h ${D}${includedir}
+    install -Dm644 ${WORKDIR}/libtinyxml2.pc ${D}${libdir}/pkgconfig/libtinyxml2.pc
 }
 
 BBCLASSEXTEND += "native"
-
--

1.9.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel