[oe] [PATCH v2] qt4: fix incorrect pkg-config files
Koen Kooi
koen at dominion.thruhere.net
Wed Jan 5 16:26:02 UTC 2011
Op 5 jan 2011, om 17:17 heeft Andreas Oberritter het volgende geschreven:
> * 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 <obi at opendreambox.org>
> CC: Koen Kooi <k.kooi at student.utwente.nl>
Acked-by: Koen Kooi <koen at openembedded.org>
> ---
> * v2: bumped INC_PR
>
> recipes/qt4/qt4-embedded.inc | 2 +-
> recipes/qt4/qt4-x11-free.inc | 2 +-
> recipes/qt4/qt4.inc | 12 +++++-------
> 3 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
> index 87b19d4..223c4f3 100644
> --- a/recipes/qt4/qt4-embedded.inc
> +++ b/recipes/qt4/qt4-embedded.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
> PRIORITY = "optional"
> HOMEPAGE = "http://www.trolltech.com"
> DEPENDS += "directfb tslib"
> -INC_PR = "r26"
> +INC_PR = "r27"
>
> QT_BASE_NAME ?= "qt4-embedded"
> QT_BASE_LIB ?= "libqt-embedded"
> diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
> index ae79d58..a98e268 100644
> --- a/recipes/qt4/qt4-x11-free.inc
> +++ b/recipes/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
> LICENSE = "GPL QPL"
> DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
>
> -INC_PR = "r22"
> +INC_PR = "r23"
>
> SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
> file://0001-cross-compile.patch \
> 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
> }
> --
> 1.7.2.3
>
>
More information about the Openembedded-devel
mailing list