From 3edb679ccd2caded8173aa02aeede00a1282b0f7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 3 Jan 2026 23:43:17 +0100 Subject: [PATCH] package/opencv4: add missing Config.in comments on gcc >= 8 Commit 75ab6cf93a3ba505897ae99b5ff4bffda55d3c7b ("package/{python-}protobuf: bump to version 28.1") added a whole bunch of gcc >= 8 dependencies to opencv4 options, but forgot to create or update appropriate Config.in comments for several options: BR2_PACKAGE_OPENCV4_LIB_OBJDETECT BR2_PACKAGE_OPENCV4_LIB_STITCHING BR2_PACKAGE_OPENCV4_WITH_PROTOBUF Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain (cherry picked from commit 73e9b996fb22205f966bacee4b556afb8afeeb79) Signed-off-by: Thomas Perale --- package/opencv4/Config.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index f71ceba2c5..d9c924a0e8 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -167,9 +167,10 @@ config BR2_PACKAGE_OPENCV4_LIB_OBJDETECT Include opencv_objdetect (object detection) module into the OpenCV build. -comment "objdetect needs a glibc or musl toolchain" +comment "objdetect needs a glibc or musl toolchain w/ gcc 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_LIB_PHOTO bool "photo" @@ -217,9 +218,10 @@ config BR2_PACKAGE_OPENCV4_LIB_STITCHING Include opencv_stitching (images stitching) module into the OpenCV build. -comment "stitching needs a glibc or musl toolchain" +comment "stitching needs a glibc or musl toolchain w/ gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_LIB_SUPERRES bool "superres" @@ -342,6 +344,10 @@ config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF help Use shared protobuf from the target system. +comment "protobuf support needs a toolchain w/ gcc >= 8" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + config BR2_PACKAGE_OPENCV4_WITH_TBB bool "tbb support" depends on !BR2_TOOLCHAIN_USES_UCLIBC # tbb