Hello.
On Mon, 2013-09-30 at 00:02, Martin Jansa wrote:
> On Sun, Sep 29, 2013 at 10:48:28AM +0100, Stefan Schmidt wrote:
> > Hello.
> >
> > On Sun, 2013-09-29 at 09:08, Martin Jansa wrote:
> > > On Sat, Sep 28, 2013 at 11:25:17PM +0100, Stefan Schmidt wrote:
> > > > ---
> > > > recipes-qt/maliit/maliit-framework-qt5_git.bb | 7 ++++---
> > > > recipes-qt/maliit/maliit-plugins-qt5_git.bb | 1 +
> > > > 2 files changed, 5 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb
> > > > b/recipes-qt/maliit/maliit-framework-qt5_git.bb
> > > > index 7b336ff..4f2da19 100644
> > > > --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
> > > > +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
> > > > @@ -54,7 +54,7 @@ EXTRA_QMAKEVARS_PRE = "\
> > > > PREFIX=${prefix} \
> > > > LIBDIR=${libdir} \
> > > > QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \
> > > > - MALIIT_INSTALL_PRF=${datadir}/qt4/mkspecs/features \
> > > > + MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \
> > > > SCHEMADIR=${sysconfdir}/gconf/schemas \
> > > > CONFIG+=disable-gconf \
> > > > CONFIG+=disable-gtk-cache-update \
> > > > @@ -68,8 +68,9 @@ EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
> > > >
> > > > do_install_append() {
> > > > #Fix absolute paths
> > > > - sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|"
> > > > ${D}/${datadir}/qt4/mkspecs/features/maliit-framework.prf
> > > > - sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|"
> > > > ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf
> > > > + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|"
> > > > ${D}/usr/lib/qt5/mkspecs/features/maliit-framework.prf
> > > > + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|"
> > > > ${D}/usr/lib/qt5/mkspecs/features/maliit-plugins.prf
> > > > + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|"
> > > > ${D}/usr/lib/qt5/mkspecs/features/maliit-defines.prf
> > >
> > > Why not use QMAKE_MKSPEC_PATH here as well?
> >
> > Because it does not work. I tried to use it initially. Just checked
> > again it fails with:
> > sed: can't read
> > /data/WebOS/webos-ports-env/webos-ports/tmp-eglibc/sysroots/maguro/usr/lib/qt5/mkspecs/features/maliit-framework.prf:
> > No such file or directory
>
> Ah sorry, I looks like I've already forgot what's in QMAKE_MKSPEC_PATH,
> what you can use is:
> ${libdir}/${QT_DIR_NAME} instead of /usr/lib/qt5/Fair enough. Changed it and attched the updated patch. Pushed it into the branch as well. I can also re-submit the whole lot if you want and if you are happy with rest. regards Stefan Schmidt
From f2ba7e0875f9dc5ed468628566a748fed9371722 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <[email protected]> Date: Thu, 19 Sep 2013 21:35:51 +0100 Subject: [PATCH 4/6] maliit-*-qt5: Adjust MKSPEC path --- recipes-qt/maliit/maliit-framework-qt5_git.bb | 7 ++++--- recipes-qt/maliit/maliit-plugins-qt5_git.bb | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 7b336ff..35415a9 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -54,7 +54,7 @@ EXTRA_QMAKEVARS_PRE = "\ PREFIX=${prefix} \ LIBDIR=${libdir} \ QT_IM_PLUGIN_PATH=${libdir}/qt4/plugins/inputmethods \ - MALIIT_INSTALL_PRF=${datadir}/qt4/mkspecs/features \ + MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \ SCHEMADIR=${sysconfdir}/gconf/schemas \ CONFIG+=disable-gconf \ CONFIG+=disable-gtk-cache-update \ @@ -68,8 +68,9 @@ EXTRA_OEMAKE += "INSTALL_ROOT=${D}" do_install_append() { #Fix absolute paths - sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-framework.prf - sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf + sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-defines.prf install -d ${D}${datadir}/applications install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index 9d5b0e2..6b019ef 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -23,6 +23,7 @@ PV = "0.99.0+git${SRCPV}" EXTRA_QMAKEVARS_PRE = "\ PREFIX=${prefix} \ + MALIIT_INSTALL_PRF=${QMAKE_MKSPEC_PATH}/mkspecs/features \ LIBDIR=${libdir} \ CONFIG+=nodoc \ " -- 1.8.4.rc3
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
