Re: [meta-qt5][PATCH 07/11] qttools: use one recipe for all compilations

[Martin Jansa <martin.jansa@gmail.com>]

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

On Mon, Aug 24, 2015 at 12:13:53PM +0300, Samuli Piippo wrote:
> Instead of separate recipes for target, native and nativesdk, use
> one recipe with BBCLASSEXTEND in place.
> 
> Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
> ---
>  recipes-qt/qt5/nativesdk-qttools_git.bb | 45 ---------------------------------
>  recipes-qt/qt5/qttools-native_git.bb    | 26 -------------------
>  recipes-qt/qt5/qttools_git.bb           |  9 ++++++-
>  3 files changed, 8 insertions(+), 72 deletions(-)
>  delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
>  delete mode 100644 recipes-qt/qt5/qttools-native_git.bb
> 
> diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
> deleted file mode 100644
> index 73e5d22..0000000
> --- a/recipes-qt/qt5/nativesdk-qttools_git.bb
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> -LIC_FILES_CHKSUM = " \
> -    file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
> -    file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
> -    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
> -    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
> -"
> -
> -QT_MODULE = "qttools"
> -
> -DEPENDS = "nativesdk-qtbase qtbase-native"
> -
> -require nativesdk-qt5.inc
> -require qt5-git.inc
> -
> -# it's already included with newer oe-core, but include it here for dylan
> -FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
> -
> -SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
> -
> -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
> -
> -FILES_${PN}-dbg = " \
> -    ${OE_QMAKE_PATH_BINS}/.debug \
> -"
> -
> -FILES_${PN} = " \
> -    ${OE_QMAKE_PATH_BINS}/* \
> -"
> -
> -do_configure() {
> -    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
> -}
> -
> -do_install() {
> -    # Fix install paths for all
> -    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
> -
> -    oe_runmake install INSTALL_ROOT=${D}
> -
> -    # remove things unused in nativesdk
> -    rm -rf ${D}${libdir}
> -}
> -
> -SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
> diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
> deleted file mode 100644
> index 13e1b79..0000000
> --- a/recipes-qt/qt5/qttools-native_git.bb
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -DEPENDS = "qtbase-native"
> -
> -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> -LIC_FILES_CHKSUM = " \
> -    file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
> -    file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
> -    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
> -    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
> -"
> -
> -QT_MODULE = "qttools"
> -
> -require qt5-native.inc
> -require qt5-git.inc
> -
> -SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
> -
> -do_configure() {
> -    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
> -}
> -
> -do_install() {
> -    oe_runmake install INSTALL_ROOT=${D}
> -}
> -
> -SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
> diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
> index e27d6ef..51690ac 100644
> --- a/recipes-qt/qt5/qttools_git.bb
> +++ b/recipes-qt/qt5/qttools_git.bb
> @@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = " \
>      file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
>  "
>  
> -DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
> +DEPENDS += "qtbase"
> +DEPENDS_class-target = "qtdeclarative qtxmlpatterns"
>  
>  SRC_URI += " \
> +    file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
>      file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
>      file://0003-add-noqtwebkit-configuration.patch \
>  "
> @@ -24,4 +26,9 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
>  
>  EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
>  
> +EXTRA_QMAKEVARS_PRE_class-native += "CONFIG+=linguistonly"
> +EXTRA_QMAKEVARS_PRE_class-nativesdk += "CONFIG+=linguistonly"

Use PACKAGECONFIG to restrict native and nativesdk builds to
linguistonly.

> +
>  SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
> +
> +BBCLASSEXTEND = "native nativesdk"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> 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: 188 bytes --]