From patchwork Mon Sep 15 07:43:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 389228 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 CE47614009B for ; Mon, 15 Sep 2014 17:43:17 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 83A1C3FDC6 for ; Mon, 15 Sep 2014 09:43:15 +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 EAFFD3FDBA for ; Mon, 15 Sep 2014 09:43:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=3162; q=dns/txt; s=ironport1; t=1410766991; x=1442302991; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=MTlEOzVZLKl86yhWH3eEy/ReWypaPGS1byd2ipVz/XM=; b=pgRZ9rrlJHxXTOw0SSG4lvJTkUmela0fiWKQNcXD04Sb0jyzSrsZ089q TXDRr42gvpR+L5R2hgh9800ByWGSOPbWXD8xIscRDU/Lh8aZIPF9fMdYT rKgnfSkwdeqz2pNCG2vcinEo1o8+vD3z+Xuyu8ujFQurNXgRd7LCPOmjn I=; X-IronPort-AV: E=Sophos;i="5.04,526,1406584800"; d="scan'208";a="5083732" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 15 Sep 2014 09:43:10 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Mon, 15 Sep 2014 09:43:10 +0200 Received: by localhost (Postfix, from userid 30019) id 218C1681EC1; Mon, 15 Sep 2014 07:43:09 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 2/3] Fix to qmake fix for 32bit hosts Date: Mon, 15 Sep 2014 07:43:07 +0000 Message-ID: <8ace76b17600e3e83509f2d804ccb41e91452aaa.1410766811.git.kibo@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 Cc: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= 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 --- recipes/qt5/qmake5.inc | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/recipes/qt5/qmake5.inc b/recipes/qt5/qmake5.inc index e8980fc..3c7212a 100644 --- a/recipes/qt5/qmake5.inc +++ b/recipes/qt5/qmake5.inc @@ -17,8 +17,12 @@ require qmake5-${PV}.inc #TBD: Bugs are seen with more more than 1 parallel maker PARALLEL_MAKE = "" -SRC_URI:>HOST_CPU_i686 = "\ - file://sdk-x86-64-build-fix.patch \ +LINUX_SDK_BUILD_PATCH_TMP="" +LINUX_SDK_BUILD_PATCH_TMP:sdk = "${LINUX_SDK_BUILD_PATCH}" +LINUX_SDK_BUILD_PATCH = "" +LINUX_SDK_BUILD_PATCH:HOST_CPU_i686 = " file://sdk-x86-64-build-fix.patch" +SRC_URI += " \ + ${LINUX_SDK_BUILD_PATCH_TMP} \ " QT_CONF_PATH = "${B}/qt.conf" @@ -78,10 +82,13 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP +CONFIGURE_NATIVE_UTILS_TMP = "" +CONFIGURE_NATIVE_UTILS_TMP:sdk = "${CONFIGURE_NATIVE_UTILS}" + CONFIGURE_NATIVE_UTILS = "" CONFIGURE_NATIVE_UTILS:HOST_CPU_i686 = "do_configure_linux" CONFIGURE_NATIVE_UTILS:HOST_LIBC_mingw = "do_configure_mingw" -do_configure[prefuncs] += "${CONFIGURE_NATIVE_UTILS}" +do_configure[prefuncs] += "${CONFIGURE_NATIVE_UTILS_TMP}" do_configure_linux () { #Use native tools instead of using the wrong sdk tools ln -sf ${STAGE_DIR}/native/bin/qmake ${S}/bin/qmake @@ -107,18 +114,14 @@ do_configure_preqt() { bin/qmake ${USE_MINGW_SPEC} ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } + +CONFIGURE_BUILD_SDK_UTILS_TMP = "" +CONFIGURE_BUILD_SDK_UTILS_TMP:sdk = "${CONFIGURE_BUILD_SDK_UTILS}" CONFIGURE_BUILD_SDK_UTILS = "" -CONFIGURE_BUILD_SDK_UTILS:HOST_CPU_i686 = "do_configure_linux2" -CONFIGURE_BUILD_SDK_UTILS:HOST_LIBC_mingw = "do_configure_mingw2" -do_configure[postfuncs] += "${CONFIGURE_BUILD_SDK_UTILS}" -do_configure_linux2 () { - #Set the build target to something else, so it does not overwrite - #the native tools - echo "TARGET = \"realmoc\"" >> ${S}/src/tools/moc/moc.pro - echo "TARGET = \"realrcc\"" >> ${S}/src/tools/rcc/rcc.pro - echo "TARGET = \"realuic\"" >> ${S}/src/tools/uic/uic.pro -} -do_configure_mingw2 () { +CONFIGURE_BUILD_SDK_UTILS:HOST_CPU_i686 = "do_configure_sdk_postfunc" +CONFIGURE_BUILD_SDK_UTILS:HOST_LIBC_mingw = "do_configure_sdk_postfunc" +do_configure[postfuncs] += "${CONFIGURE_BUILD_SDK_UTILS_TMP}" +do_configure_sdk_postfunc () { #Set the build target to something else, so it does not overwrite #the native tools echo "TARGET = \"realmoc\"" >> ${S}/src/tools/moc/moc.pro @@ -132,10 +135,12 @@ do_install() { } +INSTALL_BUILD_UTILS_TMP = "" +INSTALL_BUILD_UTILS_TMP:sdk = "${INSTALL_BUILD_UTILS}" INSTALL_BUILD_UTILS = "" INSTALL_BUILD_UTILS:HOST_CPU_i686 = "do_install_linux_fixup" INSTALL_BUILD_UTILS:HOST_LIBC_mingw = "do_install_mingw_fixup" -do_install[postfuncs] += "${INSTALL_BUILD_UTILS}" +do_install[postfuncs] += "${INSTALL_BUILD_UTILS_TMP}" do_install_linux_fixup () { #Set the correct name of the build linux utils rm ${D}${bindir}/qmake