diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-06 13:14:08 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-07 12:18:41 +0200 |
| commit | f76e45b5a8c59b1b8e4b806d2a2a09e6baf4d4e2 (patch) | |
| tree | 2b9def306ca938defae354a1ef02ea69996b416b /classes | |
| parent | 956abd44cc676af060f905c9b5c570f65bb983d3 (diff) | |
qt5: drop EXTRA_ENV
* all variables should be now correctly set by qmake
* setting PARALLEL_MAKE in MAKEFLAGS can cause
PARALLEL_MAKE * PARALLEL_MAKE processes, because first
-j is applied on top level directory and then again in
each subdir, but it's faster then make -j PARALLEL_MAKE
only in top directory
* setting QMAKE breaks build in src/tools/bootstrap, because it
forces relative path bin/qmake which isn't correct
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 97faad9f..0ba0d47f 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -15,13 +15,7 @@ OE_QMAKE_DEBUG_OUTPUT = "-d" # Paths in .prl files contain SYSROOT value SSTATE_SCAN_FILES += "*.pri *.prl" -EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" - -EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - STRIP="${OE_QMAKE_STRIP}" \ - MAKE="make -e ${PARALLEL_MAKE}"' +EXTRA_OEMAKE += " MAKEFLAGS='${PARALLEL_MAKE}'" export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" |