diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 15:26:34 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-11-11 13:24:53 +0100 |
| commit | 178a817e6f4604e0f4b24a416d5e83b428cbabe7 (patch) | |
| tree | 52cbe707471b8ca0002d315c9b970e994854b498 /classes/qmake5_base.bbclass | |
| parent | f39bc18eae46e0df30580f0e5992d069f9c881be (diff) | |
| download | meta-qt5-178a817e6f4604e0f4b24a416d5e83b428cbabe7.tar.gz | |
qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes/qmake5_base.bbclass')
| -rw-r--r-- | classes/qmake5_base.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 9ebfa08e..a766cc6b 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -164,14 +164,14 @@ qmake5_base_native_do_install() { | |||
| 164 | 164 | ||
| 165 | qmake5_base_nativesdk_do_install() { | 165 | qmake5_base_nativesdk_do_install() { |
| 166 | # Fix install paths for all | 166 | # Fix install paths for all |
| 167 | find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" | 167 | find -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" |
| 168 | 168 | ||
| 169 | oe_runmake install INSTALL_ROOT=${D} | 169 | oe_runmake install INSTALL_ROOT=${D} |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | qmake5_base_do_install() { | 172 | qmake5_base_do_install() { |
| 173 | # Fix install paths for all | 173 | # Fix install paths for all |
| 174 | find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" | 174 | find -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" |
| 175 | 175 | ||
| 176 | oe_runmake install INSTALL_ROOT=${D} | 176 | oe_runmake install INSTALL_ROOT=${D} |
| 177 | 177 | ||