[oe-commits] [meta-openembedded] 31/69: opencv: checking existence of /usr/lib

[git at git.openembedded.org]

martin_jansa pushed a commit to branch morty-next
in repository meta-openembedded.

commit d08864a28964d4cfe829f48063958d0d5ce85cd2
Author: Wenzong Fan <wenzong.fan at windriver.com>
AuthorDate: Wed Nov 16 02:32:01 2016 -0500

    opencv: checking existence of /usr/lib
    
    Remove install errors:
    
      mv: cannot stat '.../tmp/work/mips64-wrs-linux/opencv/3.1+gitAUTOINC
      +92387b1ef8-r0/image/usr/lib/*': No such file or directory
    
    Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit cefba87ff0a5f12cdb377038d67ab8550d500e82)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 72bf5b4..1bbb965 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -138,7 +138,7 @@ do_install_append() {
     sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
 
     # Move Python files into correct library folder (for multilib build)
-    if [ "$libdir" != "/usr/lib" ]; then
+    if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then
         mv ${D}/usr/lib/* ${D}/${libdir}/
         rm -rf ${D}/usr/lib
     fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.