diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch')
| -rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch deleted file mode 100644 index 59095133..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
| 3 | Date: Wed, 29 Nov 2023 12:55:19 +0530 | ||
| 4 | Subject: [PATCH 4/4] protobuf: allow target protoc to be built | ||
| 5 | |||
| 6 | We can run target binaries using a qemu wrapper so allow these to be | ||
| 7 | built and run. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate | ||
| 10 | |||
| 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 12 | --- | ||
| 13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
| 14 | thirdparty/protobuf/CMakeLists.txt | 2 +- | ||
| 15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
| 18 | index 49c5b881030..2a1ea8562bc 100644 | ||
| 19 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
| 20 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
| 21 | @@ -143,7 +143,7 @@ macro(ov_add_frontend) | ||
| 22 | set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) | ||
| 23 | add_custom_command( | ||
| 24 | OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" | ||
| 25 | - COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
| 26 | + COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
| 27 | DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} | ||
| 28 | COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" | ||
| 29 | VERBATIM | ||
| 30 | diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt | ||
| 31 | index 4b6d6da87f3..409e492a5b3 100644 | ||
| 32 | --- a/thirdparty/protobuf/CMakeLists.txt | ||
| 33 | +++ b/thirdparty/protobuf/CMakeLists.txt | ||
| 34 | @@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen | ||
| 35 | if(CMAKE_CROSSCOMPILING OR | ||
| 36 | (APPLE AND (HOST_X86_64 AND AARCH64)) OR | ||
| 37 | (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) | ||
| 38 | - set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) | ||
| 39 | + set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
| 40 | else() | ||
| 41 | set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
| 42 | endif() | ||
| 43 | -- | ||
| 44 | 2.34.1 | ||
| 45 | |||
