diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 13:09:31 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 15:55:10 +0200 |
commit | 4d0f51ce9ae925a01f3d4bfad349bcc66425809a (patch) | |
tree | f5c6011b81f32a8da0f2f745a2e82ef9f42bc0d1 /recipes-qt | |
parent | 54a6379be43dca503eb59b2dde48b7144e725f81 (diff) | |
download | meta-qt5-4d0f51ce9ae925a01f3d4bfad349bcc66425809a.tar.gz |
qtjsbackend: remove PARALLEL_MAKE setting
* it seems to work fine with modified v8.pro
Diffstat (limited to 'recipes-qt')
-rw-r--r-- | recipes-qt/qt5/qtjsbackend-native.inc | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtjsbackend.inc | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 25de8e60..d627156c 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc | |||
@@ -13,10 +13,6 @@ SRC_URI += "\ | |||
13 | file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ | 13 | file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | # Bitbake will not respect the make order set by qmake and at times it will try to compile | ||
17 | # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail | ||
18 | #PARALLEL_MAKE = "" | ||
19 | |||
20 | SEPB = "${WORKDIR}/build" | 16 | SEPB = "${WORKDIR}/build" |
21 | B = "${SEPB}" | 17 | B = "${SEPB}" |
22 | 18 | ||
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 9cbe9378..64986396 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc | |||
@@ -14,10 +14,6 @@ SRC_URI += " \ | |||
14 | file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ | 14 | file://0002-v8.pro-respect-external-host-bindir-when-set.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | # Bitbake will not respect the make order set by qmake and at times it will try to compile | ||
18 | # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail | ||
19 | PARALLEL_MAKE = "" | ||
20 | |||
21 | do_configure () { | 17 | do_configure () { |
22 | # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) | 18 | # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) |
23 | unset LD | 19 | unset LD |