From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com [209.85.215.178]) by mail.openembedded.org (Postfix) with ESMTP id 8CB9A60B60 for ; Thu, 12 Dec 2013 15:31:01 +0000 (UTC) Received: by mail-ea0-f178.google.com with SMTP id d10so306969eaj.37 for ; Thu, 12 Dec 2013 07:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=HqX2zhD0sdiQLYEYq0x1tlnMR/bb4xQDBWUVR0UMyMA=; b=yXd3pmg3rr3OQrPtlKjk8pFQTGMg54yeojqbVh1e4SOXmfQiV/0hrbcgK0/xTXM96v fBDP/TtYBQaUfMxUlwGCQB/e/GQrNGiotww7UAR0kxNlxz77NKhRe13UIbkuMYssy2Ae vdkzWXAoc/o4Qw9iO5xT0KseAA5wzQuuF1sv2OJ8y8SUBooPf4ELk3eC5o2HdD7irU8Y q0mEUNgrjCaIH+2tq6oX+iEgzKIksAWhsAw7cx+K2xmYNxVIt6+1NWeQixF/CrDXGKfv d8N063hj3KwlTYteKNeLLORhpvE4F9g78xYONCI0MSv9RSdh2udKFPfmwUfaGBUyaQqH TCpA== X-Received: by 10.15.67.142 with SMTP id u14mr8574724eex.59.1386862260418; Thu, 12 Dec 2013 07:31:00 -0800 (PST) Received: from localhost (ip-89-176-104-107.net.upcbroadband.cz. [89.176.104.107]) by mx.google.com with ESMTPSA id j46sm67249570eew.18.2013.12.12.07.30.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2013 07:30:59 -0800 (PST) Date: Thu, 12 Dec 2013 16:31:22 +0100 From: Martin Jansa To: Denys Dmytriyenko Message-ID: <20131212153122.GH3717@jama> References: <1385430478-31824-1-git-send-email-denis@denix.org> <1385430478-31824-2-git-send-email-denis@denix.org> <20131212144002.GE3717@jama> <20131212144502.GT24180@edge> <20131212145825.GF3717@jama> <20131212151455.GU24180@edge> MIME-Version: 1.0 In-Reply-To: <20131212151455.GU24180@edge> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: openembedded-devel@lists.openembedded.org Subject: Re: [meta-qt5][PATCH 1/2] nativesdk-qtbase: add nativesdk version of qtbase necessary for SDK tools X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2013 15:31:02 -0000 X-Groupsio-MsgNum: 47444 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Enx9fNJ0XV5HaWRu" Content-Disposition: inline --Enx9fNJ0XV5HaWRu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 12, 2013 at 10:14:55AM -0500, Denys Dmytriyenko wrote: > On Thu, Dec 12, 2013 at 03:58:25PM +0100, Martin Jansa wrote: > > On Thu, Dec 12, 2013 at 09:45:02AM -0500, Denys Dmytriyenko wrote: > > > On Thu, Dec 12, 2013 at 03:40:02PM +0100, Martin Jansa wrote: > > > > On Mon, Nov 25, 2013 at 08:47:57PM -0500, Denys Dmytriyenko wrote: > > > > > From: Denys Dmytriyenko > > > > >=20 > > > > > Signed-off-by: Denys Dmytriyenko > > > > > --- > > > > > recipes-qt/qt5/nativesdk-qt5.inc | 12 ++ > > > > > recipes-qt/qt5/nativesdk-qtbase.inc | 193 +++++++= ++++++++++++++ > > > > > ...ump-path-length-from-256-to-512-character.patch | 29 ++++ > > > > > ...reserve-built-qmake-and-swap-with-native-.patch | 29 ++++ > > > > > recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb | 7 + > > > > > 5 files changed, 270 insertions(+) > > > > > create mode 100644 recipes-qt/qt5/nativesdk-qt5.inc > > > > > create mode 100644 recipes-qt/qt5/nativesdk-qtbase.inc > > > > > create mode 100644 recipes-qt/qt5/nativesdk-qtbase/0001-configur= e-bump-path-length-from-256-to-512-character.patch > > > > > create mode 100644 recipes-qt/qt5/nativesdk-qtbase/0001-configur= e-preserve-built-qmake-and-swap-with-native-.patch > > > > > create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb > > > >=20 > > > > nativesdk-qtbase isn't included in FILESPATH and build fails: > > >=20 > > > Hmm, is this a change in the master oe-core? Putting patches into qtb= ase/ will=20 > > > break older builds, but that can be fixed by extending FILESPATH... I= f I find=20 > > > time, I'll try to fix it. > >=20 > > I was testing it with master, but I think that there is only BPN in > > default FILESPATH for a bit longer (i.e. also in dora). > >=20 > > FILESEXTRAPATHS =3D. "${FILE_DIRNAME}/qtbase-${PV}:" > >=20 > > seems a bit unnecessary here, because it duplicates default BP. > >=20 > > Why would adding 2 extra files in qtbase-5.1.1 break other builds? It > > seems as reasonable solution to me. >=20 > Because those files won't be picked up by default, as it expects them in= =20 > nativesdk-qtbase. Not sure if I had that issue in dora or in dylan. I sti= ll=20 > have some older dylan-based releases I have to support here... Either way= ,=20 > should be easy to fix with proper FILESEXTRAPATHS tweak, once I get time = :) I've already tested moving them to qtbase-5.1.1 and it works fine for master and should work fine for dora too. I plan to merge it to master to get more people testing it. There is also jansa/qt5-5.2.0 branch which I would like to start testing :). >=20 > > > > NOTE: recipe nativesdk-qtbase-5.1.1-r0: task do_fetch: Started > > > > WARNING: Failed to fetch URL > > > > file://0001-configure-preserve-built-qmake-and-swap-with-native-.pa= tch, > > > > attempting MIRRORS if available > > > > ERROR: Fetcher failure: Unable to find file > > > > file://0001-configure-preserve-built-qmake-and-swap-with-native-.pa= tch > > > > anywhere. The paths that were searched were: > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/nodistro > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/nodistro > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/nodistro > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/nodistro > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/qemux86-= 64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/qemux86-= 64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/qemux86-64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/qemux86-64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/qemuall > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/qemuall > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/qemuall > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/qemuall > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/x86-64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/x86-64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/x86-64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/x86-64 > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/ > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.1.1/ > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/ > > > > /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/ > > > > /OE/build/oe-core/downloads > > > > ERROR: Function failed: Fetcher failure for URL: > > > > 'file://0001-configure-preserve-built-qmake-and-swap-with-native-.p= atch'. > > > > Unable to fetch URL from any source. > > > > ERROR: Logfile of failure stored in: > > > > /OE/build/oe-core/tmp-eglibc/work/x86_64-nativesdk-oesdk-linux/nati= vesdk-qtbase/5.1.1-r0/temp/log.do_fetch.21602 > > > >=20 > > > >=20 > > > > >=20 > > > > > diff --git a/recipes-qt/qt5/nativesdk-qt5.inc b/recipes-qt/qt5/na= tivesdk-qt5.inc > > > > > new file mode 100644 > > > > > index 0000000..2eb8c14 > > > > > --- /dev/null > > > > > +++ b/recipes-qt/qt5/nativesdk-qt5.inc > > > > > @@ -0,0 +1,12 @@ > > > > > +inherit nativesdk qmake5_base > > > > > + > > > > > +# we don't want conflicts with qt4 > > > > > +OE_QMAKE_PATH_HEADERS =3D "${OE_QMAKE_PATH_QT_HEADERS}" > > > > > +OE_QMAKE_PATH_ARCHDATA =3D "${OE_QMAKE_PATH_QT_ARCHDATA}" > > > > > +OE_QMAKE_PATH_DATA =3D "${OE_QMAKE_PATH_QT_DATA}" > > > > > +OE_QMAKE_PATH_BINS =3D "${OE_QMAKE_PATH_QT_BINS}" > > > > > +OE_QMAKE_PATH_TRANSLATIONS =3D "${OE_QMAKE_PATH_QT_TRANSLATIONS}" > > > > > +OE_QMAKE_PATH_DOCS =3D "${OE_QMAKE_PATH_QT_DOCS}" > > > > > +OE_QMAKE_PATH_SETTINGS =3D "${OE_QMAKE_PATH_QT_SETTINGS}" > > > > > +OE_QMAKE_PATH_EXAMPLES =3D "${OE_QMAKE_PATH_QT_EXAMPLES}" > > > > > +OE_QMAKE_PATH_TESTS =3D "${OE_QMAKE_PATH_QT_TESTS}" > > > > > diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5= /nativesdk-qtbase.inc > > > > > new file mode 100644 > > > > > index 0000000..8e9a809 > > > > > --- /dev/null > > > > > +++ b/recipes-qt/qt5/nativesdk-qtbase.inc > > > > > @@ -0,0 +1,193 @@ > > > > > +DESCRIPTION =3D "SDK version of Qt/[X11|Mac|Embedded]" > > > > > +DEPENDS =3D "nativesdk-zlib nativesdk-dbus qtbase-native" > > > > > +SECTION =3D "libs" > > > > > +HOMEPAGE =3D "http://qt-project.org" > > > > > + > > > > > +QT_MODULE =3D "qtbase" > > > > > + > > > > > +require nativesdk-qt5.inc > > > > > + > > > > > +# shared with target version > > > > > +SRC_URI +=3D " \ > > > > > + file://0001-Add-linux-oe-g-platform.patch \ > > > > > + file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outsi= de-u.patch \ > > > > > + file://0003-Add-external-hostbindir-option.patch \ > > > > > + file://0004-qt_functions-temporary-remove-isEmpty-check.patc= h \ > > > > > + file://0006-Allow-building-a-separate-qmake-for-the-target.p= atch \ > > > > > + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-= with.patch \ > > > > > + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ > > > > > + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ > > > > > + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmak= e.va.patch \ > > > > > + file://0012-configure.prf-Allow-to-add-extra-arguments-to-ma= ke.patch \ > > > > > + file://0013-Disable-mkv8snapshot.patch \ > > > > > + file://0014-enables-tslib-device-to-be-read-from-env-variabl= e.patch \ > > > > > + file://0015-qtbase-allow-build-of-examples.patch \ > > > > > + file://0021-configure-make-pulseaudio-a-configurable-option.= patch \ > > > > > + file://0022-configure-make-alsa-a-configurable-option.patch \ > > > > > + file://0023-configure-make-freetype-a-configurable-option.pa= tch \ > > > > > + file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determin= e-pa.patch \ > > > > > +" > > > > > + > > > > > +# specific for nativesdk version > > > > > +SRC_URI +=3D " \ > > > > > + file://0001-Always-build-uic.patch \ > > > > > + file://0001-configure-preserve-built-qmake-and-swap-with-nat= ive-.patch \ > > > > > + file://0001-configure-bump-path-length-from-256-to-512-chara= cter.patch \ > > > > > +" > > > > > + > > > > > +PACKAGES =3D "${PN}-tools-dbg ${PN}-tools" > > > > > + > > > > > +PACKAGE_DEBUG_SPLIT_STYLE =3D "debug-without-src" > > > > > + > > > > > +FILES_${PN}-tools-dbg =3D " \ > > > > > + ${OE_QMAKE_PATH_BINS}/.debug \ > > > > > +" > > > > > + > > > > > +FILES_${PN}-tools =3D " \ > > > > > + ${OE_QMAKE_PATH_BINS}/* \ > > > > > +" > > > > > + > > > > > +QT_CONFIG_FLAGS +=3D " \ > > > > > + -reduce-relocations \ > > > > > + -shared \ > > > > > + -silent \ > > > > > + -no-pch \ > > > > > + -no-rpath \ > > > > > + -pkg-config \ > > > > > + ${EXTRA_OECONF} \ > > > > > +" > > > > > + > > > > > +# qtbase is exception, as these are used as install path for sys= roots > > > > > +OE_QMAKE_PATH_HOST_DATA =3D "${libdir}/${QT_DIR_NAME}" > > > > > +OE_QMAKE_PATH_HOST_LIBS =3D "${libdir}" > > > > > + > > > > > +do_generate_qt_config_file() { > > > > > + cat > ${QT_CONF_PATH} < > > > > +[Paths] > > > > > +Prefix =3D ${OE_QMAKE_PATH_PREFIX} > > > > > +Headers =3D ${OE_QMAKE_PATH_HEADERS} > > > > > +Libraries =3D ${OE_QMAKE_PATH_LIBS} > > > > > +ArchData =3D ${OE_QMAKE_PATH_ARCHDATA} > > > > > +Data =3D ${OE_QMAKE_PATH_DATA} > > > > > +Binaries =3D ${OE_QMAKE_PATH_BINS} > > > > > +LibraryExecutables =3D ${OE_QMAKE_PATH_LIBEXECS} > > > > > +Plugins =3D ${OE_QMAKE_PATH_PLUGINS} > > > > > +Imports =3D ${OE_QMAKE_PATH_IMPORTS} > > > > > +Qml2Imports =3D ${OE_QMAKE_PATH_QML} > > > > > +Translations =3D ${OE_QMAKE_PATH_TRANSLATIONS} > > > > > +Documentation =3D ${OE_QMAKE_PATH_DOCS} > > > > > +Settings =3D ${OE_QMAKE_PATH_SETTINGS} > > > > > +Examples =3D ${OE_QMAKE_PATH_EXAMPLES} > > > > > +Tests =3D ${OE_QMAKE_PATH_TESTS} > > > > > +HostBinaries =3D ${OE_QMAKE_PATH_HOST_BINS} > > > > > +HostData =3D ${OE_QMAKE_PATH_HOST_DATA} > > > > > +HostLibraries =3D ${OE_QMAKE_PATH_HOST_LIBS} > > > > > +HostSpec =3D ${OE_QMAKESPEC} > > > > > +TartgetSpec =3D ${OE_XQMAKESPEC} > > > > > +ExternalHostBinaries =3D ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} > > > > > +Sysroot =3D > > > > > +EOF > > > > > +} > > > > > + > > > > > +do_generate_qt_config_file_append() { > > > > > + cat >> ${QT_CONF_PATH} < > > > > + > > > > > +[EffectivePaths] > > > > > +Prefix=3D.. > > > > > +EOF > > > > > +} > > > > > + > > > > > +# qtbase is exception, we need to use mkspecs from ${S} > > > > > +QMAKE_MKSPEC_PATH =3D "${B}" > > > > > + > > > > > +# qtbase is exception, configure script is using our get(X)QEval= MakeConf and setBootstrapEvalVariable functions to read it from shell > > > > > +export OE_QMAKE_COMPILER > > > > > +export OE_QMAKE_CC > > > > > +export OE_QMAKE_CFLAGS > > > > > +export OE_QMAKE_CXX > > > > > +export OE_QMAKE_CXXFLAGS > > > > > +export OE_QMAKE_LINK > > > > > +export OE_QMAKE_LDFLAGS > > > > > +export OE_QMAKE_AR > > > > > +export OE_QMAKE_STRIP > > > > > + > > > > > +# another exception is that we need to run bin/qmake, because Ef= fectivePaths are relative to qmake location > > > > > +OE_QMAKE_QMAKE_ORIG =3D "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}= /qmake" > > > > > +OE_QMAKE_QMAKE =3D "bin/qmake" > > > > > + > > > > > +do_configure() { > > > > > + # we need symlink in path relative to source, because > > > > > + # EffectivePaths:Prefix is relative to qmake location > > > > > + # Also, configure expects qmake-native to swap with real one > > > > > + if [ ! -e ${B}/bin/qmake-native ]; then > > > > > + mkdir ${B}/bin > > > > > + ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake-native > > > > > + fi > > > > > + > > > > > + ${S}/configure -v \ > > > > > + -dont-process \ > > > > > + -opensource -confirm-license \ > > > > > + -sysroot ${STAGING_DIR_NATIVE} \ > > > > > + -no-gcc-sysroot \ > > > > > + -system-zlib \ > > > > > + -no-libjpeg \ > > > > > + -no-libpng \ > > > > > + -no-gif \ > > > > > + -no-accessibility \ > > > > > + -no-cups \ > > > > > + -no-nis \ > > > > > + -no-gui \ > > > > > + -no-qml-debug \ > > > > > + -no-sql-mysql \ > > > > > + -no-sql-sqlite \ > > > > > + -no-opengl \ > > > > > + -no-openssl \ > > > > > + -no-xcb \ > > > > > + -verbose \ > > > > > + -release \ > > > > > + -prefix ${OE_QMAKE_PATH_PREFIX} \ > > > > > + -bindir ${OE_QMAKE_PATH_BINS} \ > > > > > + -libdir ${OE_QMAKE_PATH_LIBS} \ > > > > > + -datadir ${OE_QMAKE_PATH_DATA} \ > > > > > + -sysconfdir ${OE_QMAKE_PATH_SETTINGS} \ > > > > > + -docdir ${OE_QMAKE_PATH_DOCS} \ > > > > > + -headerdir ${OE_QMAKE_PATH_HEADERS} \ > > > > > + -archdatadir ${OE_QMAKE_PATH_ARCHDATA} \ > > > > > + -libexecdir ${OE_QMAKE_PATH_LIBEXECS} \ > > > > > + -plugindir ${OE_QMAKE_PATH_PLUGINS} \ > > > > > + -importdir ${OE_QMAKE_PATH_IMPORTS} \ > > > > > + -qmldir ${OE_QMAKE_PATH_QML} \ > > > > > + -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \ > > > > > + -testsdir ${OE_QMAKE_PATH_TESTS} \ > > > > > + -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ > > > > > + -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ > > > > > + -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}= \ > > > > > + -no-glib \ > > > > > + -no-iconv \ > > > > > + -silent \ > > > > > + -nomake examples \ > > > > > + -nomake tests \ > > > > > + -nomake libs \ > > > > > + -no-compile-examples \ > > > > > + -no-rpath \ > > > > > + -platform ${OE_QMAKESPEC} \ > > > > > + -xplatform linux-oe-g++ \ > > > > > + ${QT_CONFIG_FLAGS} > > > > > + > > > > > + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "= Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" > > > > > +} > > > > > + > > > > > +do_install() { > > > > > + # Fix install paths for all > > > > > + find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STA= GING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" > > > > > + > > > > > + # switch back the proper qmake > > > > > + rm ${B}/bin/qmake > > > > > + mv ${B}/bin/qmake-real ${B}/bin/qmake > > > > > + > > > > > + oe_runmake install INSTALL_ROOT=3D${D} > > > > > + > > > > > + # for modules which are still using syncqt and call qtPrepar= eTool(QMAKE_SYNCQT, syncqt) > > > > > + # e.g. qt3d, qtwayland > > > > > + ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt > > > > > +} > > > > > diff --git a/recipes-qt/qt5/nativesdk-qtbase/0001-configure-bump-= path-length-from-256-to-512-character.patch b/recipes-qt/qt5/nativesdk-qtba= se/0001-configure-bump-path-length-from-256-to-512-character.patch > > > > > new file mode 100644 > > > > > index 0000000..3b312b6 > > > > > --- /dev/null > > > > > +++ b/recipes-qt/qt5/nativesdk-qtbase/0001-configure-bump-path-le= ngth-from-256-to-512-character.patch > > > > > @@ -0,0 +1,29 @@ > > > > > +From 9500744fee36c908d0cb7e034f8c8dd3dd1c4fa4 Mon Sep 17 00:00:0= 0 2001 > > > > > +From: Denys Dmytriyenko > > > > > +Date: Mon, 11 Nov 2013 20:27:30 -0500 > > > > > +Subject: [PATCH] configure: bump path length from 256 to 512 cha= racters > > > > > + > > > > > +Increase the path length that gets hardcoded into generated conf= ig.cpp file > > > > > +from 256 to 512 characters, as nativesdk path can be quite long. > > > > > + > > > > > +Signed-off-by: Denys Dmytriyenko > > > > > +--- > > > > > + configure | 2 +- > > > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > + > > > > > +diff --git a/configure b/configure > > > > > +index 304d30f..a37a587 100755 > > > > > +--- a/configure > > > > > ++++ b/configure > > > > > +@@ -3870,7 +3870,7 @@ static const char qt_configure_licensed_pr= oducts_str [256 + 12] =3D "qt_lcnsprod=3D$ > > > > > + static const char qt_configure_installation [12+11] = =3D "qt_instdate=3D`date +%Y-%m-%d`"; > > > > > +=20 > > > > > + /* Installation Info */ > > > > > +-static const char qt_configure_prefix_path_strs[][256 + 12] =3D= { > > > > > ++static const char qt_configure_prefix_path_strs[][512 + 12] =3D= { > > > > > + "qt_prfxpath=3D$QT_INSTALL_PREFIX", > > > > > + "qt_docspath=3D$QT_INSTALL_DOCS", > > > > > + "qt_hdrspath=3D$QT_INSTALL_HEADERS", > > > > > +--=20 > > > > > +1.8.3.2 > > > > > + > > > > > diff --git a/recipes-qt/qt5/nativesdk-qtbase/0001-configure-prese= rve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/nativesdk-qtba= se/0001-configure-preserve-built-qmake-and-swap-with-native-.patch > > > > > new file mode 100644 > > > > > index 0000000..048eab7 > > > > > --- /dev/null > > > > > +++ b/recipes-qt/qt5/nativesdk-qtbase/0001-configure-preserve-bui= lt-qmake-and-swap-with-native-.patch > > > > > @@ -0,0 +1,29 @@ > > > > > +From 6cd7ade28662730e5de89a171501e3902b321ffc Mon Sep 17 00:00:0= 0 2001 > > > > > +From: Denys Dmytriyenko > > > > > +Date: Mon, 11 Nov 2013 20:22:34 -0500 > > > > > +Subject: [PATCH] configure: preserve built qmake and swap with n= ative one > > > > > + > > > > > +Let configure script build the real qmake, but right after it's = built, swap > > > > > +it with a native qmake for further internal use, preserving the = real one. > > > > > + > > > > > +Signed-off-by: Denys Dmytriyenko > > > > > +--- > > > > > + configure | 2 ++ > > > > > + 1 file changed, 2 insertions(+) > > > > > + > > > > > +diff --git a/configure b/configure > > > > > +index 140c7b4..304d30f 100755 > > > > > +--- a/configure > > > > > ++++ b/configure > > > > > +@@ -4104,6 +4104,8 @@ if true; then ###[ '!' -f "$outpath/bin/qm= ake" ]; > > > > > +=20 > > > > > + (cd "$outpath/qmake"; "$MAKE") || exit 2 > > > > > + fi # Build qmake > > > > > ++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" > > > > > ++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" > > > > > +=20 > > > > > + echo "Running configuration tests..." > > > > > +=20 > > > > > +--=20 > > > > > +1.8.3.2 > > > > > + > > > > > diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb b/recipes-q= t/qt5/nativesdk-qtbase_5.1.1.bb > > > > > new file mode 100644 > > > > > index 0000000..6e4f488 > > > > > --- /dev/null > > > > > +++ b/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb > > > > > @@ -0,0 +1,7 @@ > > > > > +require qt5-${PV}.inc > > > > > +require ${PN}.inc > > > > > + > > > > > +FILESEXTRAPATHS =3D. "${FILE_DIRNAME}/qtbase-${PV}:" > > > > > + > > > > > +SRC_URI[md5sum] =3D "955d1e4da875f3872ef3208f21a757dd" > > > > > +SRC_URI[sha256sum] =3D "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b55= 07af7c03b661029a1ffa75c9" > > > > > --=20 > > > > > 1.8.3.2 > > > > >=20 > > > > > _______________________________________________ > > > > > Openembedded-devel mailing list > > > > > Openembedded-devel@lists.openembedded.org > > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > >=20 > > > > --=20 > > > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com > > >=20 > > >=20 > >=20 > > --=20 > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com >=20 >=20 --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --Enx9fNJ0XV5HaWRu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlKp1soACgkQN1Ujt2V2gBz4rQCgmH9JtX36qyyh7oQMnG4E6sYU ZtoAn0toJnRoopGTIN1KEezQZfOBC0xG =px8r -----END PGP SIGNATURE----- --Enx9fNJ0XV5HaWRu--