aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/qt5.inc6
-rw-r--r--recipes-qt/qt5/qtbase-native.inc3
-rw-r--r--recipes-qt/qt5/qtbase.inc6
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}"