taglib: fix SOname and link against stdlibc++

diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb
index 2fbd4dc..48aa375 100644 (file)
--- a/packages/taglib/taglib_1.4.bb
+++ b/packages/taglib/taglib_1.4.bb
@@ -2,16 +2,19 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of seve
 SECTION = "libs"
 HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
 S = "${WORKDIR}/taglib-${PV}"
 
 inherit autotools qmake-base pkgconfig binconfig
 
+export OE_QMAKE_LINK="${CXX}"
+
 do_configure() {
        # calling oe_runconf to generate pkgconfig and binconfig files
        oe_runconf
-       cd ${S}/taglib && rm -f Makefile* && qmake -project -t lib && \
+       cd ${S}/taglib && rm -f Makefile* && qmake -project -o tag.pro -t lib && \
        qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S}
 }
 
@@ -29,10 +32,10 @@ do_stage_append() {
     do
         install $i ${STAGING_INCDIR}/taglib/
     done
-    oe_libinstall -so -C taglib libtaglib ${STAGING_LIBDIR}
+    oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
 }
 
 do_install() {
        install -d ${D}${libdir}
-       oe_libinstall -so -C taglib libtaglib ${D}${libdir}
+       oe_libinstall -so -C taglib libtag ${D}${libdir}
 }