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

(From meta-qt5 rev: f76e45b5a8c59b1b8e4b806d2a2a09e6baf4d4e2)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/classes/qmake5_base.bbclass b/meta-qt5/classes/qmake5_base.bbclass
index 97faad9..0ba0d47 100644 (file)
--- a/meta-qt5/classes/qmake5_base.bbclass
+++ b/meta-qt5/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}"

diff --git a/meta-qt5/recipes-qt/qt5/qt5.inc b/meta-qt5/recipes-qt/qt5/qt5.inc
index a748d89..ee035dc 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5.inc
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qtbase-native.inc b/meta-qt5/recipes-qt/qt5/qtbase-native.inc
index d5f23b9..b3007a5 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtbase-native.inc
+++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index 80ce22f..281bbab 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/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}"