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 /recipes-qt | |
| 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 'recipes-qt')
| -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 |
3 files changed, 0 insertions, 15 deletions
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() { qmake5_base_do_configure } -do_compile() { - unset CFLAGS CXXFLAGS AR - - oe_runmake ${EXTRA_ENV} -} - do_install() { qmake5_base_do_install } 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" SEPB = "${WORKDIR}/build" B = "${SEPB}" -EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"' -EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" - QT_CONF_PATH = "${B}/qt.conf" 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=.. EOF } -EXTRA_ENV = 'QMAKE="bin/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}"' - # qtbase is exception, we need to use mkspecs from ${S} QMAKE_MKSPEC_PATH = "${B}" |