sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #6 from levonmaa/qtjsbackend-native-fix 

fix qtjsbackend-native build
This commit is contained in:
Otavio Salvador 2012-12-11 18:50:58 -08:00
parent d4ff67c8f7 bfe100c179
commit 6ce8dc82b7
14 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc → recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc
View File

@ -1,9 +1,9 @@
# Copyright (C) 2012 O.S. Systems Software LTDA.
QT_VERSION ?= "5.0.0-beta2"
QT_VERSION ?= "5.0.0-rc1"
SRC_URI += " \
http://releases.qt-project.org/qt5.0/beta2/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
http://releases.qt-project.org/qt5.0/rc1/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
file://linux.conf \
file://g++.conf \
"

4
recipes-qt/qt5/qt5-4.999+git.inc
View File

@ -9,10 +9,10 @@ SRC_URI += " \
S = "${WORKDIR}/git"
PV = "4.999+5.0.0-beta2+git-r${SRCPV}"
PV = "4.999+5.0.0-rc1+git${SRCPV}"
LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

9
recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
View File

@ -1,9 +0,0 @@
require qt5-native.inc
require qt5-${PV}.inc
PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "-1"
SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2"
SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f"

9
recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb Normal file
View File

@ -0,0 +1,9 @@
require qt5-native.inc
require qt5-${PV}.inc
PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "-1"
SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce"
SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805"

2
recipes-qt/qt5/qt5-native_4.999+git.bb
View File

@ -3,4 +3,4 @@ require qt5-4.999+git.inc
PR = "${INC_PR}.0"
SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804"
SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab"

7
recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb
View File

@ -1,7 +0,0 @@
require qtbase.inc
require qt5-${PV}.inc
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2"
SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f"

7
recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb Normal file
View File

@ -0,0 +1,7 @@
require qtbase.inc
require qt5-${PV}.inc
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce"
SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805"

2
recipes-qt/qt5/qtbase_4.999+git.bb
View File

@ -3,4 +3,4 @@ require qt5-4.999+git.inc
PR = "${INC_PR}.0"
SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804"
SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab"

5
recipes-qt/qt5/qtdeclarative.inc
View File

@ -1,3 +1,4 @@
# FIXME!!!
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
@ -5,6 +6,8 @@ DEPENDS = "qtbase qtjsbackend"
INC_PR = "r0"
QT_MODULE = "${PN}"
inherit qmake5
SRC_URI += " \
@ -42,4 +45,4 @@ FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*"
FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*"
FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*"
PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg"
PACKAGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg"

7
recipes-qt/qt5/qtdeclarative_4.999+git.bb
View File

@ -1,7 +1,6 @@
SRCREV = "425260c2b2a60c0c145a5e76a3b7835eadd0fd0d"
SRC_URI += "git://gitorious.org/qt/qtdeclarative.git;protocol=git"
S = "${WORKDIR}/git"
require qtdeclarative.inc
require qt5-4.999+git.inc
PR = "${INC_PR}.0"
SRCREV = "a6065d60f158ffad7a94877883af69731da94295"

28
recipes-qt/qt5/qtjsbackend-native.inc
View File

@ -3,28 +3,48 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe
DEPENDS = "qt5-native"
QT_MODULE = "qtjsbackend"
INC_PR = "r0"
inherit native
SRC_URI += "\
file://qmake.conf \
file://module_qmake.conf \
file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
"
"
# Bitbake will not respect the make order set by qmake and at times it will try to compile
# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail
PARALLEL_MAKE = ""
export QT_CONF_PATH="${WORKDIR}/qt.conf"
do_configure() {
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
unset LD
cat > ${WORKDIR}/qt.conf <<EOF
[Paths]
Prefix = ${prefix}
Binaries = ${bindir}
Headers = ${includedir}/qt5
Plugins = ${libdir}/qt5/plugins
Libraries = ${libdir}
Imports = ${datadir}/qt5/imports
Qml2Imports = ${libdir}/qt5/qml
Documentation=${docdir}/qt5
Data = ${datadir}/qt5
HostPrefix = ${STAGING_DATADIR}
HostData = ${STAGING_DATADIR}/qt5
HostBinaries = ${STAGING_BINDIR_NATIVE}
EOF
# This should not be needed. Perhaps the lack of this file is an indication
# of an error on the native recipe...
cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf
cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf
${STAGING_BINDIR_NATIVE}/qmake -d
${STAGING_BINDIR_NATIVE}/qmake -d -r
}
do_install() {

8
recipes-qt/qt5/qtjsbackend-native_4.999+git.bb
View File

@ -1,8 +1,6 @@
SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e"
SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git"
S = "${WORKDIR}/git"
require qtjsbackend-native.inc
require qt5-4.999+git.inc
PR = "${INC_PR}.0"
SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb"

8
recipes-qt/qt5/qtjsbackend.inc
View File

@ -1,7 +1,9 @@
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
DEPENDS = "qtbase"
DEPENDS = "qtbase qtjsbackend-native"
QT_MODULE = "${PN}"
INC_PR = "r0"
@ -9,8 +11,8 @@ inherit qmake5
SRC_URI += " \
file://module_qmake.conf \
file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \
"
file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \
"
# Bitbake will not respect the make order set by qmake and at times it will try to compile
# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail

7
recipes-qt/qt5/qtjsbackend_4.999+git.bb
View File

@ -1,7 +1,6 @@
SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e"
SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git"
S = "${WORKDIR}/git"
require qtjsbackend.inc
require qt5-4.999+git.inc
PR = "${INC_PR}.0"
SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb"