From: Kwang Son <k.son@samsung.com>
Date: Tue, 11 May 2021 04:02:36 +0000 (+0900)
Subject: Update lib64 check logic
X-Git-Tag: submit/tizen/20210526.020351^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d52c499a52e081f4997440b5a328d6ac6abb40c;p=platform%2Fupstream%2Fopencv.git

Update lib64 check logic

QB build system for i586 has /usr/lib64 directory which makes wrong
package install. This cmake patch check that only x86_64 and aarch64
use /usr/lib64 for install directory.

Change-Id: Icdb05386bfc3e7b8770a509c4a22f2e57b686a96
Signed-off-by: Kwang Son <k.son@samsung.com>
---

diff --git a/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch b/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch
index dd963c5a8c..042b2b1b69 100644
--- a/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch
+++ b/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch
@@ -1,5 +1,5 @@
 diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index 4ff02a77d3..c27fe7d316 100644
+index 4ff02a7..93928ad 100644
 --- a/cmake/OpenCVDetectPython.cmake
 +++ b/cmake/OpenCVDetectPython.cmake
 @@ -186,7 +186,11 @@ if(NOT ${found})
@@ -7,10 +7,10 @@ index 4ff02a77d3..c27fe7d316 100644
            set(_packages_path "python${_version_major_minor}/dist-packages")
          endif()
 -        set(_packages_path "lib/${_packages_path}")
-+        if(EXISTS /usr/lib64)
-+            set(_packages_path "lib64/${_packages_path}")
++        if(${ARCH} STREQUAL "x86_64" OR ${ARCH} STREQUAL "aarch64")
++          set(_packages_path "lib64/${_packages_path}")
 +        else()
-+            set(_packages_path "lib/${_packages_path}")
++          set(_packages_path "lib/${_packages_path}")
 +        endif()
        elseif(CMAKE_HOST_WIN32)
          get_filename_component(_path "${_executable}" PATH)