mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-27 04:20:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv4: update gcc version dependency related to protobuf

Browse Source 
Another instance of libaseil-cpp requiring gcc >= 10, which means
protobuf needs >= 10, and that wasn't propagated to all reverse
dependencies of protobuf, in this commit: opencv4.

Fixes: 76241e89e1 ("package/libabseil-cpp: bump to version 20260817.0")
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2026-09-15 23:41:04 +02:00
committed by Julien Olivain
parent 93282f76a5
commit 56cdcb8206
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package/opencv4/Config.in
View File

@@ -34,16 +34,16 @@ config BR2_PACKAGE_OPENCV4_LIB_DNN
# dnn needs fenv.h which is not provided by uclibc
depends on !BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10
select BR2_PACKAGE_OPENCV4_WITH_PROTOBUF
help
Include opencv_dnn (Deep Neural Networks) module into the
OpenCV build.
comment "dnn needs a glibc or musl toolchain, gcc >= 8"
comment "dnn needs a glibc or musl toolchain, gcc >= 10"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_UCLIBC || \
!BR2_HOST_GCC_AT_LEAST_8
!BR2_HOST_GCC_AT_LEAST_10
config BR2_PACKAGE_OPENCV4_LIB_FEATURES2D
bool "features2d"
@@ -147,7 +147,7 @@ config BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
bool "objdetect"
depends on !BR2_TOOLCHAIN_USES_UCLIBC # dnn support
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # dnn support
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # dnn support
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # dnn support
# opencv_core dependency is already enabled
select BR2_PACKAGE_OPENCV4_LIB_CALIB3D
select BR2_PACKAGE_OPENCV4_LIB_DNN
@@ -157,10 +157,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 w/ gcc 8"
comment "objdetect needs a glibc or musl toolchain w/ gcc 10"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_UCLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_8
!BR2_TOOLCHAIN_GCC_AT_LEAST_10
config BR2_PACKAGE_OPENCV4_LIB_PHOTO
bool "photo"
@@ -198,7 +198,7 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE
config BR2_PACKAGE_OPENCV4_LIB_STITCHING
bool "stitching"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # objdetect
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # objdetect
depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect
select BR2_PACKAGE_OPENCV4_LIB_CALIB3D
select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D
@@ -208,10 +208,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 w/ gcc >= 8"
comment "stitching needs a glibc or musl toolchain w/ gcc >= 10"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_UCLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_8
!BR2_TOOLCHAIN_GCC_AT_LEAST_10
config BR2_PACKAGE_OPENCV4_LIB_SUPERRES
bool "superres"
@@ -329,14 +329,14 @@ config BR2_PACKAGE_OPENCV4_WITH_PNG
config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF
bool "protobuf support"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # protobuf
select BR2_PACKAGE_PROTOBUF
help
Use shared protobuf from the target system.
comment "protobuf support needs a toolchain w/ gcc >= 8"
comment "protobuf support needs a toolchain w/ gcc >= 10"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10
config BR2_PACKAGE_OPENCV4_WITH_TBB
bool "tbb support"