All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [PATCH 4/6] maliit-*-qt5: Adjust MKSPEC path
Date: Sun, 29 Sep 2013 09:08:45 +0200	[thread overview]
Message-ID: <20130929070845.GC3575@jama> (raw)
In-Reply-To: <1380407119-2352-4-git-send-email-stefan@datenfreihafen.org>

[-- Attachment #1: Type: text/plain, Size: 2549 bytes --]

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?

>  
>      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
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

  reply	other threads:[~2013-09-29  7:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-28 22:25 [PATCH 1/6] maliit: Import maliit recipes from meta-oe Stefan Schmidt
2013-09-28 22:25 ` [PATCH 2/6] maliit-framework-qt5: Build with qt5 Stefan Schmidt
2013-09-28 22:25 ` [PATCH 3/6] maliit-plugins-qt5: " Stefan Schmidt
2013-09-28 22:25 ` [PATCH 4/6] maliit-*-qt5: Adjust MKSPEC path Stefan Schmidt
2013-09-29  7:08   ` Martin Jansa [this message]
2013-09-29  9:48     ` Stefan Schmidt
2013-09-29 22:02       ` Martin Jansa
2013-09-30 17:19         ` Stefan Schmidt
2013-09-28 22:25 ` [PATCH 5/6] meta-framework-qt5: Cleanup packaging and enable dbus activation Stefan Schmidt
2013-09-28 22:25 ` [PATCH 6/6] maliit-plugins-qt5: Set MALIIT_PLUGINS_DATA_DIR to avoid path leakage from host Stefan Schmidt
2013-09-28 22:33 ` [PATCH 1/6] maliit: Import maliit recipes from meta-oe Stefan Schmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130929070845.GC3575@jama \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.