diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-08 22:40:30 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 13:56:49 +0200 |
commit | 7caede7850d7b33011a5a0e3124180db2f7a0d6c (patch) | |
tree | 75e504c15ac33e38fb7ad58135e04662ecf25163 /recipes-qt/qt5/qtbase-native.inc | |
parent | 56d2c7f18d5058a168df01d6a4797514a0f958b6 (diff) | |
download | meta-qt5-7caede7850d7b33011a5a0e3124180db2f7a0d6c.tar.gz |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native.inc')
-rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 9 |
1 files changed, 0 insertions, 9 deletions
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 += " \ | |||
26 | # specific for native version | 26 | # specific for native version |
27 | SRC_URI += "file://0001-Always-build-uic.patch" | 27 | SRC_URI += "file://0001-Always-build-uic.patch" |
28 | 28 | ||
29 | SEPB = "${WORKDIR}/build" | ||
30 | B = "${SEPB}" | ||
31 | |||
32 | QT_CONF_PATH = "${B}/qt.conf" | 29 | QT_CONF_PATH = "${B}/qt.conf" |
33 | 30 | ||
34 | do_generate_qt_config_file() { | 31 | do_generate_qt_config_file() { |
@@ -86,12 +83,6 @@ export OE_QMAKE_AR | |||
86 | export OE_QMAKE_STRIP | 83 | export OE_QMAKE_STRIP |
87 | 84 | ||
88 | do_configure_prepend() { | 85 | do_configure_prepend() { |
89 | # Similar logic is in autotools.bbclass | ||
90 | if [ -d ${B} -a "${S}" != "${B}" ] ; then | ||
91 | # Existing separate build directory, exists, remove | ||
92 | rm -rf "${B}/*" | ||
93 | fi | ||
94 | |||
95 | (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 86 | (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" |
96 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 87 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" |
97 | } | 88 | } |