Commit Graph

66 Commits

Author SHA1 Message Date
Martin Jansa e9c61a9e6f qmake: fix MAKEFLAGS when PARALLEL_MAKE has space
* quotes are needed, because some people have '-j 9' instead of '-j9'
* this can in theory cause PARALLEL_MAKE x PARALLEL_MAKE threads, because
  MAKE itself is using PARALLEL_MAKE threads to run inner makes
2013-04-17 16:10:01 +02:00
Martin Jansa c27dac3e4e qtbase: use the same patch for qt.conf override for target and native 2013-04-17 16:10:01 +02:00
Martin Jansa 70b1b233b2 qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or absolute sysroot
* fix paralel build
* default make does good job, cleans mkspecs, installs all headers and
  libs needed for qtjsbackend-native
* move native tools to QT_DIR_NAME prefix, this way qt4 and qt5 can be
  staged at the same time
* only variables referencing WORKDIR are now QMAKE_PRL_BUILD_DIR
  ./x86_64-linux/usr/lib/libQt5Network.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/network/
  ./x86_64-linux/usr/lib/libQt5Xml.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/xml/
  ./x86_64-linux/usr/lib/libQt5Bootstrap.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/tools/bootstrap/
  ./x86_64-linux/usr/lib/libQt5Concurrent.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/concurrent/
  ./x86_64-linux/usr/lib/libQt5Core.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/corelib/
  ./x86_64-linux/usr/lib/libQt5Test.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/testlib/
  ./x86_64-linux/usr/lib/libQt5Sql.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/sql/
  ./x86_64-linux/usr/lib/libQt5DBus.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/dbus/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:09:56 +02:00
Martin Jansa 5d5ba83cc6 qt5-native: rename to qtbase-native to avoid confusion
* we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what
* drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:08:56 +02:00
Eric Blade a376cc61ed qt5: upgrade to 5.0.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-02-18 00:55:04 +01:00
Mikko Levonmaa a812c654db qt5-native: Getting rid of printf statements in qmake
They will cause the building of cmake-native to fail as it
will parse the output of qmake -query and is not expecting
to find the added lines in the output

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2013-02-17 10:04:10 +01:00
Martin Jansa 9f04cb7bb6 qt5: move module specific files to own directories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-01 20:32:34 +01:00
Martin Jansa 319a61802d qt5: remove unused qmake-build.conf.sh
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-01 20:32:20 +01:00
Martin Jansa 597f9bf624 qt5: upgrade recipes to use 5.0.0 tarballs
* and change DEFAULT_PREFERRENCE for git recipes negative again
* bump SRCREV in git recipes to latest and update PV

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-20 12:12:15 +01:00
Martin Jansa 1ecc46ac42 qtbase: don't touch STAGING_DATADIR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-19 17:53:14 +01:00
Martin Jansa 6a07d6efce qtbase, qtdeclarative: bump SRCREV to latest
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-17 20:33:14 +01:00
Otavio Salvador 22b5908bfe Merge pull request #7 from levonmaa/master
Fix up prl and pkgconfig file generation and paths for the qt.conf
2012-12-17 11:14:48 -08:00
Mikko Levonmaa 34d4955894 qmake5: library path correction in generated qt.conf
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-14 16:46:41 -08:00
Mikko Levonmaa b93420ad8f qtbase: fix up prl and pkgconfig file generation
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-14 16:40:39 -08:00
Martin Jansa 6b7dd87f92 qt5: fixup FILES_ entries
* some are not needed as they are included in default value

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-12 20:08:47 +01:00
Martin Jansa 7b3138f369 qt5: use lastest SRCREV in stable branches
* master branches were removed today and old SRCREVs are invalid now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-12 20:08:47 +01:00
Martin Jansa 20091a9f08 qtjsbackend: use common qt5.inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-12 20:08:47 +01:00
Martin Jansa 0ff97f9e6a qtdeclarative: use common qt5.inc, fix invalid PACKAGES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-12 20:08:47 +01:00
Martin Jansa 97f4709e4c qt5: move qtbase specific stuff from qt5.inc to qtbase.inc
* qt5.inc should be used by all qtmodule.inc
* add missing PACKAGES in qt5.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-12 20:08:40 +01:00
Martin Jansa a03f6cc2bf qtbase: disable xcb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-12 06:13:33 +01:00
Otavio Salvador 6ce8dc82b7 Merge pull request #6 from levonmaa/qtjsbackend-native-fix
fix qtjsbackend-native build
2012-12-11 18:50:58 -08:00
Mikko Levonmaa bfe100c179 qtjsbackend: fix native dependency
Also fixes the broken qtjsbackent-native recipe

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-11 14:42:35 -08:00
Martin Jansa 921546e328 qtdeclarative: fix typo
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:52 +01:00
Martin Jansa ffc2911bce qtjsbackend: fix SRC_URI formatting
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:52 +01:00
Martin Jansa b7cdb5428d qtjsbackend_4.999+git: use common structure and bump SRCREV to latest
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:52 +01:00
Martin Jansa a52f36a63c qtdeclarative_4.999+git: use common structure and bump SRCREV to latest
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:51 +01:00
Martin Jansa 458e15b19e qtdeclarative: LIC_FILES_CHKSUM should be in source, not COMMON_LICENSE_DIR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:50 +01:00
Martin Jansa ccb4d199df qt5-4.999+git.inc: update PV for SRCREVs after 5.0.0-rc1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:49 +01:00
Martin Jansa 0879ad08aa qtbase, qt5-native: upgrade to 5.0.0-rc1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 02:09:41 +01:00
Martin Jansa d6c825767c qt5-4.999+git.inc: fix PV format
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 00:20:18 +01:00
Martin Jansa 436fab1083 qtbase-4.999+git: bump SRCREV to latest
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 00:19:33 +01:00
Martin Jansa c460ac223b qt5-native-4.999+git: bump SRCREV to latest
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 00:18:05 +01:00
Otavio Salvador d4ff67c8f7 Merge pull request #5 from levonmaa/master
Fixed installations and recipes for qtjsbackend and qtdeclarative
2012-12-10 11:27:37 -08:00
Mikko Levonmaa 9f3d14a2fc qtdeclarative: packaging update and recipe cleanup
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-09 13:56:34 -08:00
Mikko Levonmaa 14f60829d8 qtjsbackend: SHA bump
Also uses the same qmake.conf as other modules

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-09 13:56:02 -08:00
Mikko Levonmaa bd6c9c28c2 qtbase: fix installations
Created new variables OE_CROSS_INSTALL_DATA and OE_CROSS_HOST_DATA
to support the installation and configuration of qtbase and dependant
modules.

Added paths for Qml2Imports

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-09 13:50:26 -08:00
Mikko Levonmaa 5dc4d0616a qt5-native, qtbase: Git version is preferred
Atleast until qt5 is offciall released. Also updated git SHAs

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-09 13:45:11 -08:00
Mikko Levonmaa 16e4143ba5 qtdeclarative: Initial recipe
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-07 09:02:32 -08:00
Mikko Levonmaa 18b6ac18c7 qtjsbackend: fixed packaging
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-07 08:54:33 -08:00
Mikko Levonmaa a45a6a184f qtjsbackend: Initial recipe
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-07 08:54:20 -08:00
Mikko Levonmaa b514c5d67a Updated QT_CONF_PATH default values in qmake5_base
This allows the subsequent modules to install correctly. Also during
do_configure we stage target specific file into the staging area and
modify some prf files inorder to make the module (qt_lib_<module>.pri)
files install correctly

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-07 08:48:15 -08:00
Otavio Salvador b0fc5cab61 Merge pull request #3 from levonmaa/master
qtbase: mkspecs are now staged correctly
2012-12-05 03:47:16 -08:00
Mikko Levonmaa 17d2bf1cdd qtbase: mkspecs are now staged correctly
They are placed under STAGING_DATADIR as they need to be
kept separate from the native side. The reason for doing so
is that some qt modules require native tools and the mkspecs
in STAGING_DATADIR_NATIVE cannot be polluted with the target
mkspecs

There are still some packaging issues

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-04 17:03:14 -08:00
Martin Jansa 93fc33ea28 qt5-native: explicitly disable xcb
* otherwise we need for -system-xcb
  libxcb-native libxau-native libxdmcp-native xcb-util-wm-native
  xcb-util-image-native xcb-util-keysyms-native
  or for -qt-xcb
  libxcb-native libxau-native libxdmcp-native
  and fix underlinking in xcb linking test (QMAKE_LIBS_XCB)
  | linking xcb
  | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXau.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link)
  | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXdmcp.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link)
  | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauDisposeAuth'
  | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauGetBestAuthByAddr'
  | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XdmcpWrap'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-04 02:27:46 +01:00
Martin 'JaMa' Jansa 9914f2c64f Merge pull request #2 from levonmaa/master
Updating recipes to use correct tools and fixing installations
2012-12-03 17:26:02 -08:00
Mikko Levonmaa 2dd5038560 Preserve the PARALLEL_MAKE value when compiling
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:15:35 -08:00
Mikko Levonmaa ff173560e2 qtbase: partially resolves module pri installation
The pri files get correctly placed under the work dir, but fail
to stage correctly. Also there are some packaging issues

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:15:35 -08:00
Mikko Levonmaa c3e8e8de59 qt5-native: mkspecs are now installed correctly
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:15:35 -08:00
Mikko Levonmaa cba28bbc10 qtbase: use the correct tools from the native sysroot
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:14:35 -08:00
Mikko Levonmaa 05d88f867d qt5-native: Always compile and install uic
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:11:58 -08:00