From patchwork Wed Jan 5 12:48:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: qt4: fix incorrect pkg-config files Date: Wed, 05 Jan 2011 12:48:20 -0000 From: Andreas Oberritter X-Patchwork-Id: 176 Message-Id: <1294231700-27043-1-git-send-email-obi@opendreambox.org> To: openembedded-devel@lists.openembedded.org Cc: k.kooi@student.utwente.nl * Previously, include statements were generated like this: -I.../mipsel-oe-linux/usr/include/qtopia/QtCore -I.../mipsel-oe-linux/usr/include/qtopia/QtCore/qt4-embedded/QtCoreE -I.../mipsel-oe-linux/usr/include/qtopia/QtCore/qtopia * The sed rules ignored QT_LIBINFIX. * The sed rules incorrectly used QT_BASE_NAME instead of QT_DIR_NAME. * Now, they look like this, which is what an application expects: -I.../mipsel-oe-linux/usr/include/qtopia/QtCore -I.../mipsel-oe-linux/usr/include/qtopia * Tested with qt4-embedded on mipsel Signed-off-by: Andreas Oberritter --- recipes/qt4/qt4.inc | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index ac1fc83..52fa146 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -285,15 +285,13 @@ do_install() { ${D}${libdir}/pkgconfig/*.pc for name in ${QT_LIB_NAMES}; do sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc + if [ -f ${D}${libdir}/pkgconfig/${name}${QT_LIBINFIX}.pc ]; then + sed -i -e /^includedir=/s#"/${name}"## \ + -e /^Cflags:/s#"${QT_DIR_NAME}"#"${name}"# \ + ${D}${libdir}/pkgconfig/${name}${QT_LIBINFIX}.pc + fi done - # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: - for pc in ${D}${libdir}/pkgconfig/*.pc ; do - sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ - -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ - -e 's:IP{:I${:g' $pc - done - install -d ${D}/${libdir}/fonts touch ${D}/${libdir}/fonts/fontdir }