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/qt5.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/qt5.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e752ed6e..b29bc891 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
| @@ -11,19 +11,10 @@ require qt5_arch.inc | |||
| 11 | 11 | ||
| 12 | QT_MODULE ?= "${BPN}" | 12 | QT_MODULE ?= "${BPN}" |
| 13 | 13 | ||
| 14 | SEPB = "${WORKDIR}/build" | ||
| 15 | B = "${SEPB}" | ||
| 16 | |||
| 17 | do_configure() { | 14 | do_configure() { |
| 18 | set_arch | 15 | set_arch |
| 19 | set_endian | 16 | set_endian |
| 20 | 17 | ||
| 21 | # Similar logic is in autotools.bbclass | ||
| 22 | if [ -d ${B} -a "${S}" != "${B}" ] ; then | ||
| 23 | # Existing separate build directory, exists, remove | ||
| 24 | rm -rf "${B}/*" | ||
| 25 | fi | ||
| 26 | |||
| 27 | qmake5_base_do_configure | 18 | qmake5_base_do_configure |
| 28 | } | 19 | } |
| 29 | 20 | ||
