From: Marek Pikuła Date: Mon, 14 Nov 2022 14:48:46 +0000 (+0100) Subject: riscv64: Add RISC-V ARCH flag X-Git-Tag: accepted/tizen/unified/20230104.172211^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a02158737f5e53192b4e7006da08d6572a33a48d;p=platform%2Fupstream%2Fopencv.git riscv64: Add RISC-V ARCH flag Change-Id: Ie61fa0138cf8b7bb9c7de4b6fc40e3fa2930bfdd Signed-off-by: Łukasz Stelmach --- diff --git a/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch b/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch index 042b2b1b69..ac27e0c8aa 100644 --- a/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch +++ b/packaging/1001-TIZEN-OPENCV-PYTHON3-LIB64-PATH.patch @@ -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}") diff --git a/packaging/opencv.spec b/packaging/opencv.spec index e5a22f3d99..04745e43f4 100644 --- a/packaging/opencv.spec +++ b/packaging/opencv.spec @@ -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