From patchwork Fri Jul 25 10:28:31 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: 373647 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 CE4891400D2 for ; Fri, 25 Jul 2014 20:28:36 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 105923FB51 for ; Fri, 25 Jul 2014 12:28:35 +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 ABD013FB51 for ; Fri, 25 Jul 2014 12:28:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1764; q=dns/txt; s=ironport1; t=1406284112; x=1437820112; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=zzLk6N2OmIPkNeYmhR4kLtpuYpgqYAss5qgOslc/xrQ=; b=sCCugHPp23Dtqxji5RjCd1OkOwiApTOpyPcqdbBZNfAzNjdCIL2xE8q0 Sbx5HhL4fAxiHPnQenOlvrX0SoMggiGtUttKfA+VRsp6HFGgQVjo02uaf OvK/kkZEwHk39qVte+l6ukS0gnlX0AQ4va2rX0qEKY553uspHooi/Az4c k=; X-IronPort-AV: E=Sophos;i="5.01,730,1400018400"; d="scan'208";a="4929047" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 25 Jul 2014 12:28:32 +0200 Received: from VMPREVAS1.prevas.se ([fe80::d582:e193:281c:3bc9]) by VMPREVAS3.prevas.se ([172.16.8.103]) with mapi id 14.02.0387.000; Fri, 25 Jul 2014 12:28:32 +0200 From: =?iso-8859-1?Q?Christian_Br=E4uner_S=F8rensen?= To: Svend Aage Vedstesen , "dev@oe-lite.org" Subject: RE: [PATCH 15/15] setup.sh: QMAKESPEC can be specified by a short name Thread-Topic: [PATCH 15/15] setup.sh: QMAKESPEC can be specified by a short name Thread-Index: AQHPm1HCWdtppnqBB02B4PkE8tCVppuwr5BG Date: Fri, 25 Jul 2014 10:28:31 +0000 Message-ID: References: , In-Reply-To: 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 Svend Aaage Thanks for the patch! I squashed this commit together with the commit were you upgraded the setup script. /Christian diff --git a/recipes/sdk/qt5-sdk-script/setup.sh b/recipes/sdk/qt5-sdk-script/setup.sh index 6539e0f..d873b3e 100755 --- a/recipes/sdk/qt5-sdk-script/setup.sh +++ b/recipes/sdk/qt5-sdk-script/setup.sh @@ -67,13 +67,6 @@ export OE_QMAKE_CXX="${CXX}" export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" -# Must we differentiate here? -if [[ $CURRENT_OS == Linux* ]] ; then - export QMAKESPEC="${SYS}usr/share/qt5/mkspecs/linux-oe-g++" -else - export QMAKESPEC="linux-oe-g++" -fi - QT_CONF_FILE=${TOOL}/qt.conf touch ${QT_CONF_FILE} || exit 1 @@ -96,3 +89,5 @@ echo "TargetSpec = ${SYS_REL_TOOL}/usr/share/qt5/mkspecs/linux-oe-g++" >> ${QT_C # Set the paths to the config file export QT_CONF_PATH="${QT_CONF_FILE}" +# And Specs for target +export QMAKESPEC="linux-oe-g++"