From patchwork Mon Jun 23 08:50:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Kjaergaard X-Patchwork-Id: 362691 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 5F6D81400AF for ; Mon, 23 Jun 2014 18:50:29 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 732833F9B1 for ; Mon, 23 Jun 2014 10:50:25 +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 334043F9B1 for ; Mon, 23 Jun 2014 10:50:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1866; q=dns/txt; s=ironport1; t=1403513424; x=1435049424; h=from:to:cc:subject:date:message-id:mime-version; bh=cHUaGnKwTu4J43uTnHx/P5sS5qmAO0pT5UEf8DzEoLs=; b=k7ivDLPOfwhMhNykKItwkDXMrUR8ApiO8D56uFn2hLO3Ez5z91C5HTa5 kHTTjCrliLIwkB2FkUqz171LYnHd+RiRerljh/fXHtJnGCWDnBz16N+XB LJATYCOFObjtfPwLp/GVGR7RH/fWTWuJtsBvX2CUdAVr4JALJtOy8eZQz o=; X-IronPort-AV: E=Sophos;i="5.01,528,1400018400"; d="scan'208";a="4844265" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 23 Jun 2014 10:50:24 +0200 Received: from arh116.prevas.se (172.16.11.15) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Mon, 23 Jun 2014 10:50:23 +0200 From: To: Subject: [qt] qt5module: fix building modules Date: Mon, 23 Jun 2014 10:50:18 +0200 Message-ID: <1403513418-18969-1-git-send-email-jabk@prevas.dk> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Originating-IP: [172.16.11.15] 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 From: Jacob Kjaergaard --- classes/qmake5_base.oeclass | 6 +++--- classes/qt5module.oeclass | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) 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 \