From patchwork Mon Sep 15 07:43:06 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: 389227 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 CB5FC140096 for ; Mon, 15 Sep 2014 17:43:18 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id B67B43FF50 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 352CC3FDC6 for ; Mon, 15 Sep 2014 09:43:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=4437; q=dns/txt; s=ironport1; t=1410766991; x=1442302991; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=javubZJnZu3KlTt2d8IX31KmsK4P1nlyTO9L2if+GRA=; b=sxIp4g7MoWfzkfbS87JFectuN83yoc9423EtvS5nMogkqO9CVKtVOlYR /i+hLOgdD8aX16VHLOZfDn1nhiwcqzw7GWlZu0sivCCErVRJFI7Be6FCR fxYsNmAGSrTCInr5XlZDvZUkmMi2k11TE0JXyDTUNfzyVoMGNI6FPclSC Q=; X-IronPort-AV: E=Sophos;i="5.04,526,1406584800"; d="scan'208";a="5083733" 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 1780C68166B; Mon, 15 Sep 2014 07:43:09 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 1/3] qmake5: Fix 32 bit SDK build on 64 bit host without i386 multilib packages installed Date: Mon, 15 Sep 2014 07:43:06 +0000 Message-ID: <074ec4ccf2920abaaa828c1744b572f16871fc6d.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 --- .../qt5/qmake5-5.1.1/sdk-x86-64-build-fix.patch | 11 +++++ recipes/qt5/qmake5.inc | 50 ++++++++++++++++++---- 2 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 recipes/qt5/qmake5-5.1.1/sdk-x86-64-build-fix.patch diff --git a/recipes/qt5/qmake5-5.1.1/sdk-x86-64-build-fix.patch b/recipes/qt5/qmake5-5.1.1/sdk-x86-64-build-fix.patch new file mode 100644 index 0000000..18eb31b --- /dev/null +++ b/recipes/qt5/qmake5-5.1.1/sdk-x86-64-build-fix.patch @@ -0,0 +1,11 @@ +--- qtbase-opensource-src-5.1.1/configure.orig 2014-09-03 09:52:44.154535578 +0200 ++++ qtbase-opensource-src-5.1.1/configure 2014-09-03 09:47:21.822545102 +0200 +@@ -4076,7 +4076,7 @@ + \"\$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp\" \ + \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ + \"\$(SOURCE_PATH)/src/corelib/tools/qlocal_unix.cpp\"" +- EXEEXT= ++ EXEEXT="real" + fi + if [ "$BUILD_ON_MAC" = "yes" ]; then + echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" diff --git a/recipes/qt5/qmake5.inc b/recipes/qt5/qmake5.inc index 9650c8d..e8980fc 100644 --- a/recipes/qt5/qmake5.inc +++ b/recipes/qt5/qmake5.inc @@ -17,6 +17,10 @@ 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 \ +" + QT_CONF_PATH = "${B}/qt.conf" EXTRA_OECONF = " \ @@ -73,9 +77,19 @@ export OE_QMAKE_LDFLAGS export OE_QMAKE_AR export OE_QMAKE_STRIP -CONFIGURE_MINGW_UTILS = "" -CONFIGURE_MINGW_UTILS:HOST_LIBC_mingw = "do_configure_mingw" -do_configure[prefuncs] += "${CONFIGURE_MINGW_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_linux () { +#Use native tools instead of using the wrong sdk tools + ln -sf ${STAGE_DIR}/native/bin/qmake ${S}/bin/qmake + ln -sf ${STAGE_DIR}/native/bin/moc ${S}/bin/moc + ln -sf ${STAGE_DIR}/native/bin/rcc ${S}/bin/rcc + ln -sf ${STAGE_DIR}/native/bin/uic ${S}/bin/uic +} + do_configure_mingw () { #Use native tools to build instead of using the mingw tools ln -sf ${STAGE_DIR}/native/bin/qmake ${S}/bin/qmake @@ -93,9 +107,17 @@ 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_MINGW_UTILS = "" -CONFIGURE_BUILD_MINGW_UTILS:HOST_LIBC_mingw = "do_configure_mingw2" -do_configure[postfuncs] += "${CONFIGURE_BUILD_MINGW_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 () { #Set the build target to something else, so it does not overwrite #the native tools @@ -110,9 +132,19 @@ do_install() { } -INSTALL_MINGW_UTILS = "" -INSTALL_MINGW_UTILS:HOST_LIBC_mingw = "do_install_mingw_fixup" -do_install[postfuncs] += "${INSTALL_MINGW_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_linux_fixup () { + #Set the correct name of the build linux utils + rm ${D}${bindir}/qmake + install ${S}/bin/qmakereal ${D}${bindir}/qmake + #mv ${D}${bindir}/qmakereal ${D}${bindir}/qmake + mv ${D}${bindir}/realmoc ${D}${bindir}/moc + mv ${D}${bindir}/realuic ${D}${bindir}/uic + mv ${D}${bindir}/realrcc ${D}${bindir}/rcc +} do_install_mingw_fixup () { #Set the correct name of the build mingw utils rm ${D}${bindir}/qmake