[oe] [meta-qt5][PATCHv2] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}

[Martin Jansa]

On Thu, Feb 20, 2014 at 12:12:11PM -0500, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys at ti.com>
> 
> * This way we don't mangle ${B} and can repeat do_install if necessary. And
>   previously it would require running do_compile again to restore the proper
>   state of ${B}.
> * Need to bump PR, since do_compile isn't changing, but needs to re-run to
>   re-populate qmake-real binary.
> 
> Signed-off-by: Denys Dmytriyenko <denys at ti.com>
> ---
>  recipes-qt/qt5/nativesdk-qtbase.inc | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
> index fa44009..3cb9b0e 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
> @@ -10,6 +10,8 @@ require nativesdk-qt5.inc
>  # it's already included with newer oe-core, but include it here for dylan
>  FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
>  
> +PR = "r1"
> +

It's already merged, but please don't add new PRs, especially to .inc
files.

>  # common with -native and target version
>  SRC_URI += "\
>      file://0001-Add-linux-oe-g-platform.patch \
> @@ -192,14 +194,12 @@ do_install() {
>      # Fix install paths for all
>      find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
>  
> -    # switch back the proper qmake
> -    if [ -e ${B}/bin/qmake-real ]; then
> -        rm ${B}/bin/qmake
> -        mv ${B}/bin/qmake-real ${B}/bin/qmake
> -    fi
> -
>      oe_runmake install INSTALL_ROOT=${D}
>  
> +    # replace the native qmake installed above with nativesdk version
> +    rm -rf ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
> +    install -m 755 ${B}/bin/qmake-real ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
> +
>      # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
>      # e.g. qt3d, qtwayland
>      ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
> -- 
> 1.8.3.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140222/040dc790/attachment-0002.sig>