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 | |
parent | 956abd44cc676af060f905c9b5c570f65bb983d3 (diff) | |
download | meta-qt5-f76e45b5a8c59b1b8e4b806d2a2a09e6baf4d4e2.tar.gz |
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>
-rw-r--r-- | classes/qmake5_base.bbclass | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 6 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 3 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 6 |
4 files changed, 1 insertions, 22 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" | |||
15 | # Paths in .prl files contain SYSROOT value | 15 | # Paths in .prl files contain SYSROOT value |
16 | SSTATE_SCAN_FILES += "*.pri *.prl" | 16 | SSTATE_SCAN_FILES += "*.pri *.prl" |
17 | 17 | ||
18 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" | 18 | EXTRA_OEMAKE += " MAKEFLAGS='${PARALLEL_MAKE}'" |
19 | |||
20 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ | ||
21 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ | ||
22 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ | ||
23 | STRIP="${OE_QMAKE_STRIP}" \ | ||
24 | MAKE="make -e ${PARALLEL_MAKE}"' | ||
25 | 19 | ||
26 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" | 20 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" |
27 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" | 21 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" |
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a748d896..ee035dc5 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -75,12 +75,6 @@ do_configure() { | |||
75 | qmake5_base_do_configure | 75 | qmake5_base_do_configure |
76 | } | 76 | } |
77 | 77 | ||
78 | do_compile() { | ||
79 | unset CFLAGS CXXFLAGS AR | ||
80 | |||
81 | oe_runmake ${EXTRA_ENV} | ||
82 | } | ||
83 | |||
84 | do_install() { | 78 | do_install() { |
85 | qmake5_base_do_install | 79 | qmake5_base_do_install |
86 | } | 80 | } |
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index d5f23b99..b3007a50 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
@@ -28,9 +28,6 @@ SRC_URI += "file://0001-Always-build-uic.patch" | |||
28 | SEPB = "${WORKDIR}/build" | 28 | SEPB = "${WORKDIR}/build" |
29 | B = "${SEPB}" | 29 | B = "${SEPB}" |
30 | 30 | ||
31 | EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' | ||
32 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" | ||
33 | |||
34 | QT_CONF_PATH = "${B}/qt.conf" | 31 | QT_CONF_PATH = "${B}/qt.conf" |
35 | 32 | ||
36 | do_generate_qt_config_file() { | 33 | do_generate_qt_config_file() { |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 80ce22f1..281bbaba 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -41,12 +41,6 @@ Prefix=.. | |||
41 | EOF | 41 | EOF |
42 | } | 42 | } |
43 | 43 | ||
44 | EXTRA_ENV = 'QMAKE="bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} -after \ | ||
45 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ | ||
46 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ | ||
47 | STRIP="${OE_QMAKE_STRIP}" \ | ||
48 | MAKE="make -e ${PARALLEL_MAKE}"' | ||
49 | |||
50 | # qtbase is exception, we need to use mkspecs from ${S} | 44 | # qtbase is exception, we need to use mkspecs from ${S} |
51 | QMAKE_MKSPEC_PATH = "${B}" | 45 | QMAKE_MKSPEC_PATH = "${B}" |
52 | 46 | ||