From: Fabrice Fontaine Date: Mon, 13 Jan 2020 19:57:57 +0000 (+0100) Subject: package/opencv3: fix build with protobuf X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad6a0d0d65692e7a06b2c43b299141ac397b192c;p=buildroot.git package/opencv3: fix build with protobuf External protobuf is used instead of embedded one since commit 31c68a449ecd7da61ecfd909bea7ce799f9a6450. However it fails to build on: [ 63%] Building CXX object modules/dnn/CMakeFiles/opencv_dnn.dir/misc/caffe/opencv-caffe.pb.cc.o In file included from /home/naourr/work/instance-0/output-1/build/opencv3-3.4.9/modules/dnn/misc/caffe/opencv-caffe.pb.cc:4: /home/naourr/work/instance-0/output-1/build/opencv3-3.4.9/modules/dnn/misc/caffe/opencv-caffe.pb.h:17:2: error: #error This file was generated by an older version of protoc which is 17 | #error This file was generated by an older version of protoc which is | ^~~~~ /home/naourr/work/instance-0/output-1/build/opencv3-3.4.9/modules/dnn/misc/caffe/opencv-caffe.pb.h:18:2: error: #error incompatible with your Protocol Buffer headers. Please 18 | #error incompatible with your Protocol Buffer headers. Please | ^~~~~ /home/naourr/work/instance-0/output-1/build/opencv3-3.4.9/modules/dnn/misc/caffe/opencv-caffe.pb.h:19:2: error: #error regenerate this file with a newer version of protoc. 19 | #error regenerate this file with a newer version of protoc. | ^~~~~ /home/naourr/work/instance-0/output-1/build/opencv3-3.4.9/modules/dnn/misc/caffe/opencv-caffe.pb.cc:12:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory 12 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fix this error by setting PROTOBUF_UPDATE_FILES to ON Fixes: - http://autobuild.buildroot.org/results/219258c90709fc34748929f1dcdf4f0649215e61 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 2c5d6b041d..fab6716340 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -282,7 +282,9 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y) -OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON +OPENCV3_CONF_OPTS += \ + -DPROTOBUF_UPDATE_FILES=ON \ + -DWITH_PROTOBUF=ON OPENCV3_DEPENDENCIES += protobuf else OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF