riscv64: Add RISC-V ARCH flag 61/284561/1
authorMarek Pikuła <m.pikula@partner.samsung.com>
Mon, 14 Nov 2022 14:48:46 +0000 (15:48 +0100)
committerŁukasz Stelmach <l.stelmach@samsung.com>
Fri, 18 Nov 2022 18:25:43 +0000 (19:25 +0100)
Change-Id: Ie61fa0138cf8b7bb9c7de4b6fc40e3fa2930bfdd
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch
packaging/opencv.spec

index 042b2b1b690bbc7dd8da5a2a75ce5b6725899eb1..ac27e0c8aab595fa8be11398953f8d795949b3af 100644 (file)
@@ -7,7 +7,7 @@ index 4ff02a7..93928ad 100644
            set(_packages_path "python${_version_major_minor}/dist-packages")
          endif()
 -        set(_packages_path "lib/${_packages_path}")
-+        if(${ARCH} STREQUAL "x86_64" OR ${ARCH} STREQUAL "aarch64")
++        if(${ARCH} STREQUAL "x86_64" OR ${ARCH} STREQUAL "aarch64" OR ${ARCH} STREQUAL "riscv64")
 +          set(_packages_path "lib64/${_packages_path}")
 +        else()
 +          set(_packages_path "lib/${_packages_path}")
index e5a22f3d99b49ec5c90c8cfdac4ac15779515fd6..04745e43f4c937ee70cba863203db8e0bfcb0755 100644 (file)
@@ -13,7 +13,7 @@ License: Apache-2.0 and BSD-3-Clause
 Source0: %{name}-%{version}.tar.gz
 Source100: opencv-contrib-%{version}.tar.gz
 # In cmake/OpenCVDetectPython.cmake, python packages are installed
-# in lib/ regardless of i586, armv7l, x86_64, aarch64
+# in lib/ regardless of i586, armv7l, x86_64, aarch64, riscv64
 # So, this patch installs the python packages in:
 # lib64/ if x86_64 or aarch64
 # lib/ if i586 or armv7l
@@ -81,6 +81,9 @@ ARCH=x86_64
 %ifarch %ix86
 ARCH=i386
 %endif
+%ifarch riscv64
+ARCH=riscv64
+%endif
 
 # compatibility to opencv3
 sed -i 's/opencv4.pc/opencv.pc/g' cmake/OpenCVGenPkgconfig.cmake