Commit Graph

96 Commits

Author SHA1 Message Date
Martin Jansa 92705869f7 qtjsbackend: add .pri and .prl to SSTATE_SCAN_FILES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa d2d5b7804e qt5: package files with and without QT_DIR_NAME prefix
* makes it easier to modify paths without QA warnings about unpackaged files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 38de259db8 qtjsbackend-native: Use separate build directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 09516373c0 qmake: allow to disable debug output
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa af9d25bbe7 qtbase-native: Enable debug output from Makefile generation 2013-04-28 13:39:57 +02:00
Martin Jansa e89e33fd17 qmake_base: remove QT_DIR_NAME from libdir
* using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be
  installed in this prefix too
* modify ArchData variable to move mkspecs files to qt5 prefix (so that
  they don't conflict with qt4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 9b97567e9c 5.0.2+git: bump SRCREVs a bit more
* it's close to 5.1.0
2013-04-28 13:39:33 +02:00
Martin Jansa ea8d37c17d qtdeclarative: Fix SEPB build, remove module_qmake.conf
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:33 +02:00
Martin Jansa 9fddbb70bd qtjsbackend: Fix SEPB build and work around wrong mkspec install path
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:33 +02:00
Martin Jansa a86304a384 qt5: Add mkspecs package and update FILES to package ${QT_DIR_NAME} directories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:33 +02:00
Martin Jansa 06ae6e8c9e qtbase5_base: move binaries and libs to QT_DIR_NAME
* mkspecs are now installed to libdir/${QT_DIR_NAME}
* use the same qt.conf for all qtbase5_base, only qtbase-native is different now
2013-04-28 13:39:33 +02:00
Martin Jansa 812c33e0c6 qtbase: temporary disable target qmake build and add PN-mkspecs 2013-04-28 13:39:32 +02:00
Martin Jansa def240608a qmake5_base: add Plugins settings
* otherwise plugins are installed in /lib/plugins
2013-04-28 13:39:32 +02:00
Martin Jansa 40436b7fc9 qmake5_base: don't push AR to EXTRA_ENV
* it overwrites value set from shell env in qmake.conf and ar is loosing cqs params
  mkspecs/linux-oe-g++/qmake.conf:QMAKE_AR = $(OE_QMAKE_AR) cqs

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:32 +02:00
Martin Jansa 861b62f51e qt5-versions.inc: add include file to select PREFERRED_VERSIONs of qt5 components 2013-04-28 13:39:28 +02:00
Martin Jansa 6fb40c8d03 qt5-git: bump revision in git recipes to latest stable branch
* there are important fixes in qtbase bootstrapping
* create also own directory for patches, easier for many versions to coexist for now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:05:07 +02:00
Martin Jansa 42ab168449 qt5: add 5.0.2
* patch files are kept in separate dir, because I expect that 5.0.1
  will have to live a bit longer for e.g. webkit-qt developers to adapt

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:05:07 +02:00
Martin Jansa 239e292d02 qt5: restore 5.0.0 recipes
* there are some issues with 5.0.1 and qt-webkit, keep 5.0.0 available
  until everybody is ready to upgrade to 5.0.2 or newer

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:05:07 +02:00
Martin Jansa fe65aed339 qtbase: improve internal build system to support OE way of building qt
* add linux-oe-g++ mkspec directly with patch
* add functions to read and eval OE_QMAKE functions from mkspec and
  also export them with QMakeVar to be available also for config.tests
* add external-host-bindir parameter to skip building native tools
  even when we're in fact cross-compiling (because we have them from
  qtbase-native build already).
* use separated ${B} and ${S} and clean ${B} when reconfiguring
  stalled qmake cache can be used when configure is reexecuted
  cleaning ${B} prevents that and provide cleaner separation
* OE_QMAKE_AR cqs is added by Makefile, having it here too was causing
  issues
* isEmpty(QT_EXTERNAL_HOST_BINS) doesn't work, so lets use exist()
  even when it allows to incorrectly set wrong directory and build
  native tools again (instead of skipping them)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-26 00:04:56 +02:00
Martin Jansa 97738e9d62 qt5: unify indentation
* use 4 spaces everywhere like meta-oe and other layers do now
2013-04-17 16:49:18 +02:00
Martin Jansa 1e5520a64f qt5-5.0.1: use QT_VERSION_DIR, just for consistence"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:49:02 +02:00
Martin Jansa e16556b8c7 qtbase: add udev to DEPENDS
* it's autodetected, causing undeterministic builds

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:18:37 +02:00
Martin Jansa 1a2ad7b702 qmake5_base: drop unused exports
UIC/MOC/RCC are no longer defined in generated Makefiles
2013-04-17 16:10:02 +02:00
Martin Jansa 1a272bc79d qtbase: disable gdb_dwarf_index
* qmake is trying to call native gdb and we don't depend on gdb-native
  (or even provide gdb-native)
* fixes errors like this:
  /bin/sh: gdb: command not found
  /bin/sh: line 0: test: -gt: unary operator expected
  which are not fatal, but still misleading in do_configure output
2013-04-17 16:10:02 +02:00
Martin Jansa b78a292a58 qtbase: replace g++.conf and linux.conf with qmake.conf
* g++.conf and linux.conf were outdated a lot, lacking new options like
  QMAKE_COMPILER causing a lot of warning like:
  Project WARNING: qmake spec does not announce the compiler family. Guessed gcc.

* Instead of replacing whole common files, use custom qmake.conf which
  overwrites common setting after including it
2013-04-17 16:10:02 +02:00
Martin Jansa de250e3d0e qtbase: drop qmake.conf.sh and qplatformdefs
* defaults in linux-g++ are correct, we need only to modify common
  linux.conf and g++-unix.conf
2013-04-17 16:10:02 +02:00
Martin Jansa 85b0bb6445 qtbase: correctly configure 2013-04-17 16:10:02 +02:00
Martin Jansa 2b5c531b22 qtbase: don't touch STAGING and bypass sstate
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:10:01 +02:00
Martin Jansa eb1ad81906 qtbase: add patch to eval QMAKE_CXX
* fixes errors in log.do_configure trying to call wrong CXX
2013-04-17 16:10:01 +02:00
Martin Jansa 94ca12bf49 qmake5_base: define both QMAKESPEC and let recipe select which one to use
* different platform/xplatform can enable cross-compile build in upstream qmake
  but that's not the same as what recipes are doing (upstream builds native tools
  when bootstraping target qtbase, recipes build native tools with separate
  qtbase-native and then want to skip building tools)
* still separate variables for both QMAKESPECs can be useful e.g. for
  other native recipes
2013-04-17 16:10:01 +02:00
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