qtjsbackend: fix native dependency
Also fixes the broken qtjsbackent-native recipe Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
This commit is contained in:
parent
921546e328
commit
bfe100c179
|
@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
|
||||||
PV = "4.999+5.0.0-rc1+git${SRCPV}"
|
PV = "4.999+5.0.0-rc1+git${SRCPV}"
|
||||||
|
|
||||||
LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
|
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://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
|
||||||
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
|
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
|
||||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
|
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
|
||||||
|
|
|
@ -6,6 +6,8 @@ DEPENDS = "qtbase qtjsbackend"
|
||||||
|
|
||||||
INC_PR = "r0"
|
INC_PR = "r0"
|
||||||
|
|
||||||
|
QT_MODULE = "${PN}"
|
||||||
|
|
||||||
inherit qmake5
|
inherit qmake5
|
||||||
|
|
||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
|
|
|
@ -3,12 +3,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe
|
||||||
|
|
||||||
DEPENDS = "qt5-native"
|
DEPENDS = "qt5-native"
|
||||||
|
|
||||||
|
QT_MODULE = "qtjsbackend"
|
||||||
|
|
||||||
INC_PR = "r0"
|
INC_PR = "r0"
|
||||||
|
|
||||||
inherit native
|
inherit native
|
||||||
|
|
||||||
SRC_URI += "\
|
SRC_URI += "\
|
||||||
file://qmake.conf \
|
file://module_qmake.conf \
|
||||||
file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
|
file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
@ -16,15 +18,33 @@ SRC_URI += "\
|
||||||
# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail
|
# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail
|
||||||
PARALLEL_MAKE = ""
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
|
export QT_CONF_PATH="${WORKDIR}/qt.conf"
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
|
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
|
||||||
unset LD
|
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
|
# This should not be needed. Perhaps the lack of this file is an indication
|
||||||
# of an error on the native recipe...
|
# 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() {
|
do_install() {
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
LICENSE = "LGPLv2.1"
|
LICENSE = "LGPLv2.1"
|
||||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
|
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
|
||||||
|
|
||||||
DEPENDS = "qtbase"
|
DEPENDS = "qtbase qtjsbackend-native"
|
||||||
|
|
||||||
|
QT_MODULE = "${PN}"
|
||||||
|
|
||||||
INC_PR = "r0"
|
INC_PR = "r0"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue