diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-02-27 21:26:09 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 16:09:56 +0200 |
commit | 70b1b233b20c4128cd068c35244c1a97934edf1d (patch) | |
tree | 7ef6af7444accecfd34264a78e07b8db4ad5c147 /classes | |
parent | 5d5ba83cc6eadbff6d60d5ae4947bc9b48d846f4 (diff) | |
download | meta-qt5-70b1b233b20c4128cd068c35244c1a97934edf1d.tar.gz |
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>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qmake5.bbclass | 5 | ||||
-rw-r--r-- | classes/qmake5_base.bbclass | 58 |
2 files changed, 37 insertions, 26 deletions
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 00d6c0ea..68c19f7f 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass | |||
@@ -6,11 +6,6 @@ inherit qmake5_base | |||
6 | QT5TOOLSDEPENDS ?= "qtbase-native " | 6 | QT5TOOLSDEPENDS ?= "qtbase-native " |
7 | DEPENDS_prepend = "${QT5TOOLSDEPENDS}" | 7 | DEPENDS_prepend = "${QT5TOOLSDEPENDS}" |
8 | 8 | ||
9 | export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++" | ||
10 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic" | ||
11 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc" | ||
12 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc" | ||
13 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" | ||
14 | export OE_QMAKE_LINK = "${CXX}" | 9 | export OE_QMAKE_LINK = "${CXX}" |
15 | export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" | 10 | export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" |
16 | export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" | 11 | export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" |
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ee5ff780..b9279967 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -1,35 +1,51 @@ | |||
1 | QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" | ||
2 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" | ||
3 | QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
1 | 4 | ||
2 | # We override this completely to eliminate the -e normally passed in | 5 | EXTRA_OEMAKE = ' MAKEFLAGS=${PARALLEL_MAKE} ' |
3 | EXTRA_OEMAKE = ' MAKEFLAGS= ' | ||
4 | 6 | ||
5 | export OE_QMAKE_CC="${CC}" | 7 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ |
6 | export OE_QMAKE_CFLAGS="${CFLAGS}" | 8 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ |
7 | export OE_QMAKE_CXX="${CXX}" | 9 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ |
8 | export OE_QMAKE_LDFLAGS="${LDFLAGS}" | 10 | AR="${TARGET_PREFIX}ar cqs" \ |
9 | export OE_QMAKE_AR="${AR} cqs" | 11 | MOC="${OE_QMAKE_MOC}" \ |
10 | export OE_QMAKE_STRIP="echo" | 12 | UIC="${OE_QMAKE_UIC}" \ |
11 | export OE_QMAKE_RPATH="-Wl,-rpath-link," | 13 | RCC="${OE_QMAKE_RCC}" \ |
14 | MAKE="make -e ${PARALLEL_MAKE}"' | ||
15 | |||
16 | export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++" | ||
17 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | ||
18 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" | ||
19 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" | ||
20 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" | ||
21 | export OE_QMAKE_CC = "${CC}" | ||
22 | export OE_QMAKE_CFLAGS = "${CFLAGS}" | ||
23 | export OE_QMAKE_CXX = "${CXX}" | ||
24 | export OE_QMAKE_LDFLAGS = "${LDFLAGS}" | ||
25 | export OE_QMAKE_AR = "${AR} cqs" | ||
26 | export OE_QMAKE_STRIP = "echo" | ||
27 | export OE_QMAKE_RPATH = "-Wl,-rpath-link," | ||
28 | export OE_QMAKE_CONF_COMPILER = "g++" | ||
29 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" | ||
30 | export QT_DIR_NAME ?= "qt5" | ||
12 | 31 | ||
13 | # do not export STRIP to the environment | 32 | # do not export STRIP to the environment |
14 | STRIP[unexport] = "1" | 33 | STRIP[unexport] = "1" |
15 | 34 | ||
16 | do_generate_qt_config_file() { | 35 | do_generate_qt_config_file() { |
17 | |||
18 | export QT_CONF_PATH=${WORKDIR}/qt.conf | ||
19 | cat > ${WORKDIR}/qt.conf <<EOF | 36 | cat > ${WORKDIR}/qt.conf <<EOF |
20 | [Paths] | 37 | [Paths] |
21 | Binaries = ${bindir} | 38 | Binaries = ${bindir} |
22 | Headers = ${STAGING_INCDIR}/qt5 | 39 | Libraries = ${libdir} |
23 | Plugins = ${libdir}/qt5/plugins | 40 | Prefix = ${prefix} |
24 | Libraries = ${STAGING_LIBDIR} | 41 | Headers = ${includedir}/${QT_DIR_NAME} |
25 | Imports = ${datadir}/qt5/imports | 42 | Data = ${datadir}/${QT_DIR_NAME} |
26 | Qml2Imports = ${libdir}/qt5/qml | 43 | ArchData = ${libdir}/${QT_DIR_NAME} |
27 | Documentation=${docdir}/qt5 | 44 | Documentation = ${docdir}/${QT_DIR_NAME} |
28 | Data = ${datadir}/qt5 | 45 | HostData = ${STAGING_DATADIR}/${QT_DIR_NAME} |
29 | HostData = ${STAGING_DATADIR}/qt5 | 46 | HostSpecPath = ${QMAKE_MKSPEC_PATH} |
30 | HostBinaries = ${STAGING_BINDIR_NATIVE} | 47 | HostBinaries = ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME} |
31 | EOF | 48 | EOF |
32 | |||
33 | } | 49 | } |
34 | 50 | ||
35 | addtask generate_qt_config_file after do_patch before do_configure | 51 | addtask generate_qt_config_file after do_patch before do_configure |