diff options
author | Florent Revest <revestflo@gmail.com> | 2019-05-27 22:02:48 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-30 00:37:21 +0000 |
commit | 46c87e060dfd0e6cf132a330eab8cbefddde215d (patch) | |
tree | cd9feb2c947d86fbc5c8b83005c43a7a676713cb | |
parent | 60e61ea26a0f221fdb8c992990686c9f449f27c5 (diff) | |
download | meta-qt5-46c87e060dfd0e6cf132a330eab8cbefddde215d.tar.gz |
qmake5_base.bbclass: Don't expand find -name search patterns
A wildcard not put between quotes is expanded by bash. If files matching
the pattern are found in the source directory then the find command is
non-sense and fails.
This commit put those search patterns in quotes and fixes the
installation of some recipes.
Signed-off-by: Florent Revest <revestflo@gmail.com>
-rw-r--r-- | classes/qmake5_base.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 20ff33d4..4650d597 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -241,17 +241,17 @@ qmake5_base_do_install() { | |||
241 | qmake5_base_fix_install ${STAGING_DIR_NATIVE} | 241 | qmake5_base_fix_install ${STAGING_DIR_NATIVE} |
242 | 242 | ||
243 | # Replace host paths with qmake built-in properties | 243 | # Replace host paths with qmake built-in properties |
244 | find ${D} \( -name *.pri -or -name *.prl \) -exec \ | 244 | find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \ |
245 | sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ | 245 | sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ |
246 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' {} \; | 246 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' {} \; |
247 | 247 | ||
248 | # Replace host paths with pkg-config built-in variable | 248 | # Replace host paths with pkg-config built-in variable |
249 | find ${D} -name *.pc -exec \ | 249 | find ${D} -name "*.pc" -exec \ |
250 | sed -i -e 's|prefix=${STAGING_DIR_HOST}|prefix=|g' \ | 250 | sed -i -e 's|prefix=${STAGING_DIR_HOST}|prefix=|g' \ |
251 | -e 's|${STAGING_DIR_HOST}|${pc_sysrootdir}|g' {} \; | 251 | -e 's|${STAGING_DIR_HOST}|${pc_sysrootdir}|g' {} \; |
252 | 252 | ||
253 | # Replace resolved lib path with the lib name | 253 | # Replace resolved lib path with the lib name |
254 | find ${D} -name *.cmake -exec \ | 254 | find ${D} -name "*.cmake" -exec \ |
255 | sed -i -e 's@/[^;]*/lib\([^;]*\)\.\(so\|a\)@\1@g' {} \; | 255 | sed -i -e 's@/[^;]*/lib\([^;]*\)\.\(so\|a\)@\1@g' {} \; |
256 | 256 | ||
257 | } | 257 | } |