From patchwork Fri Jul 25 10:26:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 373643 X-Patchwork-Delegate: chbs@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 0D74C1400E6 for ; Fri, 25 Jul 2014 20:26:52 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 119D63FB51 for ; Fri, 25 Jul 2014 12:26:51 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 830803FB51 for ; Fri, 25 Jul 2014 12:26:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2849; q=dns/txt; s=ironport1; t=1406284008; x=1437820008; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=G2fhqzu9yYWEhOtsIdVib8UBOANdgYZHYmLo15zJvF8=; b=RwOFFvEneWPMAlj5FmqUJOepGmIuT3kM9wLDYhCcqDXdWP81XKHS5cyI Zy2vh1fgudWFJPKaNGaTBf2wEx+Fir7V8Ltp+bXkzLLwbTD+Bnc+pGU2Z X9fTZkSEsSSdcgfNy9FnDFmla8jIkmBS9Gn/XOO+zFThXmMvHpVxS3raF E=; X-IronPort-AV: E=Sophos;i="5.01,730,1400018400"; d="scan'208";a="4929040" Received: from vmprevas4.prevas.se (HELO smtp.prevas.se) ([172.16.8.104]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 25 Jul 2014 12:26:47 +0200 Received: from VMPREVAS1.prevas.se ([fe80::d582:e193:281c:3bc9]) by VMPREVAS4.prevas.se ([172.16.8.104]) with mapi id 14.02.0387.000; Fri, 25 Jul 2014 12:26:47 +0200 From: =?iso-8859-1?Q?Christian_Br=E4uner_S=F8rensen?= To: =?iso-8859-1?Q?Jacob_Bars=F8e_Kj=E6rgaard?= , "dev@oe-lite.org" Subject: RE: [qt] qt5module: fix building modules Thread-Topic: [qt] qt5module: fix building modules Thread-Index: AQHPjsAultfZ+gLaSUyaJnJHbi1fjpuwx9jW Date: Fri, 25 Jul 2014 10:26:47 +0000 Message-ID: References: <1403513418-18969-1-git-send-email-jabk@prevas.dk> In-Reply-To: <1403513418-18969-1-git-send-email-jabk@prevas.dk> Accept-Language: en-GB, sv-SE, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.11.11] MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org Hi Jacob Thanks for the patch! I did not merge your patch as shown below. Instead I took the liberty to set the QMAKE path correct in the qmake5_base.oeclass. By doing so, it was only needed to set the HOST_BIN_PATH in the qt5module class. /Christian diff --git a/classes/qmake5_base.oeclass b/classes/qmake5_base.oeclass index 5bc497f..25f6fbe 100644 --- a/classes/qmake5_base.oeclass +++ b/classes/qmake5_base.oeclass @@ -38,7 +38,7 @@ EXTRA_OEMAKE = " \ OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" -OE_QMAKE_QMAKE = "${STAGE_DIR}/native/bin/${QT_DIR_NAME}/qmake" +OE_QMAKE_QMAKE ?= "${STAGE_DIR}/native/bin/${QT_DIR_NAME}/qmake" OE_QMAKE_COMPILER = "${CC}" OE_QMAKE_CC = "${CC}" OE_QMAKE_CFLAGS = "${CFLAGS}" @@ -70,8 +70,8 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" OE_QMAKE_PATH_TESTS = "${datadir}/tests" OE_QMAKE_PATH_HOST_PREFIX = "" -OE_QMAKE_PATH_HOST_BINS = "${bindir}" -OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" +OE_QMAKE_PATH_HOST_BINS ?= "${bindir}" +OE_QMAKE_PATH_HOST_DATA ?= "${QMAKE_MKSPEC_PATH_TARGET}" OE_QMAKE_PATH_QT_HEADERS = "${includedir}/${QT_DIR_NAME}" OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}" diff --git a/classes/qt5module.oeclass b/classes/qt5module.oeclass index dbbb44c..8575a41 100644 --- a/classes/qt5module.oeclass +++ b/classes/qt5module.oeclass @@ -3,7 +3,10 @@ ## Setups everything needed for compilation of qt5 modules. inherit c++ make qmake5 pkgconfig -OE_QMAKE_PATH_HOST_BINS = "${STAGE_DIR}/native/bin/${QT_DIR_NAME}" + +OE_QMAKE_PATH_HOST_BINS = "${STAGE_DIR}/native/bin/" +OE_QMAKE_QMAKE = "${STAGE_DIR}/native/bin/qmake" + CLASS_DEPENDS += "\ qtbase-dev zlib-dev libpthread \ libdl libz librt libpng-dev libpng \