Skip to content

Commit cc9ee48

Browse files
committed
system/flatbuffers: fix patch flow of flatbuffers
Applying patch to flatbuffers patching file '<' Hunk apache#1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file '<.rej' patching file '<' Hunk apache#1 FAILED at 39. 1 out of 1 hunk FAILED -- saving rejects to file '<.rej' patching file '<' Hunk apache#1 FAILED at 495. 1 out of 1 hunk FAILED -- saving rejects to file '<.rej' patching file '<' Hunk apache#1 FAILED at 23. 1 out of 1 hunk FAILED -- saving rejects to file '<.rej' patch: **** Can't reopen file '<' : No such file or directory -- Configuring done (12.8s) -- Generating done (0.3s) Signed-off-by: chao an <[email protected]>
1 parent 6560618 commit cc9ee48

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

system/flatbuffers/CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,15 @@ if(CONFIG_SYSTEM_FLATBUFFERS)
3333
flatbuffers_fetch
3434
URL ${FLATBUFFERS_URL} SOURCE_DIR ${FLATBUFFERS_DIR} BINARY_DIR
3535
${CMAKE_BINARY_DIR}/apps/math/flatbuffers/flatbuffers
36+
PATCH_COMMAND patch -d ${FLATBUFFERS_DIR} -p1 <
37+
${CMAKE_CURRENT_LIST_DIR}/flatbuffers.patch
3638
DOWNLOAD_NO_PROGRESS true
3739
TIMEOUT 30)
3840

3941
FetchContent_GetProperties(flatbuffers_fetch)
4042

4143
if(NOT flatbuffers_fetch_POPULATED)
4244
FetchContent_Populate(flatbuffers_fetch)
43-
44-
# Apply the patch after fetching the content
45-
execute_process(
46-
COMMAND ${CMAKE_COMMAND} -E echo "Applying patch to flatbuffers"
47-
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
48-
49-
execute_process(COMMAND patch -d ${FLATBUFFERS_DIR} -p1 <
50-
${CMAKE_CURRENT_LIST_DIR}/flatbuffers.patch)
5145
endif()
5246
endif()
5347

0 commit comments

Comments
 (0)