diff options
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.4.0.bb (renamed from meta-oe/recipes-support/opencv/opencv_4.3.0.bb) | 10 |
2 files changed, 38 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 000000000..c5a64387f --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 18 Aug 2020 00:36:49 -0700 | ||
4 | Subject: [PATCH] Use -Os to compile tinyxml2.cpp | ||
5 | |||
6 | This workarounds issue [1] seen on riscv with gcc | ||
7 | |||
8 | [1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 | ||
9 | |||
10 | Upstream-Status: Inappropriate [ OE-Specific ] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | modules/datasets/CMakeLists.txt | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt | ||
17 | index 56ca9e310..99b7a33f6 100644 | ||
18 | --- a/modules/datasets/CMakeLists.txt | ||
19 | +++ b/modules/datasets/CMakeLists.txt | ||
20 | @@ -2,7 +2,7 @@ set(the_description "datasets framework") | ||
21 | |||
22 | set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") | ||
23 | if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
24 | - ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC | ||
25 | + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC | ||
26 | elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | ||
27 | ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang | ||
28 | endif() | ||
29 | -- | ||
30 | 2.28.0 | ||
31 | |||
diff --git a/meta-oe/recipes-support/opencv/opencv_4.3.0.bb b/meta-oe/recipes-support/opencv/opencv_4.4.0.bb index 7927ce25f..372e15cd0 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.4.0.bb | |||
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
10 | 10 | ||
11 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" | 11 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" |
12 | 12 | ||
13 | SRCREV_opencv = "01b2c5a77ca6dbef3baef24ebc0a5984579231d9" | 13 | SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" |
14 | SRCREV_contrib = "e6f32c6a69043456a806a4e802ee3ce7b7059c93" | 14 | SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" |
15 | SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" | 15 | SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" |
16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
@@ -50,7 +50,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ | |||
50 | file://download.patch \ | 50 | file://download.patch \ |
51 | file://0001-Make-ts-module-external.patch \ | 51 | file://0001-Make-ts-module-external.patch \ |
52 | " | 52 | " |
53 | PV = "4.3.0" | 53 | SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" |
54 | 54 | ||
55 | S = "${WORKDIR}/git" | 55 | S = "${WORKDIR}/git" |
56 | 56 | ||
@@ -80,6 +80,8 @@ do_unpack_extra() { | |||
80 | } | 80 | } |
81 | addtask unpack_extra after do_unpack before do_patch | 81 | addtask unpack_extra after do_unpack before do_patch |
82 | 82 | ||
83 | CMAKE_VERBOSE = "VERBOSE=1" | ||
84 | |||
83 | EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ | 85 | EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ |
84 | -DWITH_1394=OFF \ | 86 | -DWITH_1394=OFF \ |
85 | -DENABLE_PRECOMPILED_HEADERS=OFF \ | 87 | -DENABLE_PRECOMPILED_HEADERS=OFF \ |
@@ -204,3 +206,5 @@ do_install_append() { | |||
204 | rm -rf ${D}/usr/lib | 206 | rm -rf ${D}/usr/lib |
205 | fi | 207 | fi |
206 | } | 208 | } |
209 | |||
210 | TOOLCHAIN = "gcc" | ||