From patchwork Wed Jul 9 08:42:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Svend Aage Vedstesen X-Patchwork-Id: 368146 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 83ACB14009C for ; Wed, 9 Jul 2014 18:42:47 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 29E363FD30 for ; Wed, 9 Jul 2014 10:42:46 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 32A853FD30 for ; Wed, 9 Jul 2014 10:42:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=972; q=dns/txt; s=ironport2; t=1404895364; x=1436431364; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=6UXBEAPDkf84h+6fWJCKPSOEgMIOIrL5bU/HLCmWuRo=; b=xqtI0yS12MAll8hr+de52aTYbcQl7PNeGyKT32Yy7gco62tQ+9MnhrJw tAZK9A3Xpe39G7Douj9r0tWlA7hQRZABMQFk4fYXYibzglomxxP0vKstj zwMd+i0sQX9TJheNMTL/oDYVLK6djjRa+9bMordISnvuhw1j9QcZvgAOL Y=; X-IronPort-AV: E=Sophos;i="5.01,630,1400018400"; d="scan'208";a="882273" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 09 Jul 2014 10:42:43 +0200 Received: from svav-VirtualBox.prevas.se (172.16.11.7) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 9 Jul 2014 10:42:43 +0200 From: Svend Aage Vedstesen To: Subject: [PATCH 15/15] setup.sh: QMAKESPEC can be specified by a short name Date: Wed, 9 Jul 2014 10:42:26 +0200 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.11.7] 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 Do not make QMAKESPEC OS dependent --- recipes/sdk/qt5-sdk-script/setup.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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++"