summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-03 16:47:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-17 16:10:01 +0200
commite9c61a9e6f51f500df349f8fe569ec095a1b8d2b (patch)
treee84af51e857011123503d8d74f8c89b8198ec20e
parentc27dac3e4e11fb512a1483dacb8a4dcceb827323 (diff)
downloadmeta-qt5-e9c61a9e6f51f500df349f8fe569ec095a1b8d2b.tar.gz
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
-rw-r--r--classes/qmake5_base.bbclass2
-rw-r--r--recipes-qt/qt5/qtbase-native.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index b9279967..c91f7bd1 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -2,7 +2,7 @@ QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs"
2OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" 2OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
3QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" 3QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
4 4
5EXTRA_OEMAKE = ' MAKEFLAGS=${PARALLEL_MAKE} ' 5EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
6 6
7EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ 7EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \
8 INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ 8 INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 43e32530..d9cc4870 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -18,7 +18,7 @@ SRC_URI += " \
18" 18"
19 19
20EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' 20EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"'
21EXTRA_OEMAKE = ' MAKEFLAGS=${PARALLEL_MAKE} ' 21EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
22 22
23EXTRA_OECONF = " \ 23EXTRA_OECONF = " \
24 -prefix ${prefix} \ 24 -prefix ${prefix} \