From 7caede7850d7b33011a5a0e3124180db2f7a0d6c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 22:40:30 +0200 Subject: qmake5: Fix cleaning separate build directory and use it by default * "${B}/*" in quotes doesn't match anything, better to remove whole directory (incluing .files) and recreate it * not sure why I've added quotes after testing first version, we don't expect B with spaces.. but I'm a bit scared with rm -rf ${SOME_VAR} after one glibc upgrade cleaned my whole disk and attached NFS array when OLD_LOCALE_PATH wasn't detected correctly... * qmake works well with separate B, use it by default Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'recipes-qt/qt5/qtbase-native.inc') diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index cd54990d..12166951 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -26,9 +26,6 @@ SRC_URI += " \ # specific for native version SRC_URI += "file://0001-Always-build-uic.patch" -SEPB = "${WORKDIR}/build" -B = "${SEPB}" - QT_CONF_PATH = "${B}/qt.conf" do_generate_qt_config_file() { @@ -86,12 +83,6 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP do_configure_prepend() { - # Similar logic is in autotools.bbclass - if [ -d ${B} -a "${S}" != "${B}" ] ; then - # Existing separate build directory, exists, remove - rm -rf "${B}/*" - fi - (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } -- cgit v1.2.3-54-g00ecf