speccy88 commented on PR #19224: URL: https://github.com/apache/nuttx/pull/19224#issuecomment-4826693031
You were right; the failure was real. Root cause: Berry upstream stores `default/berry.c` with CRLF line endings, while the NuttX patch file is LF. Fresh Make and CMake builds could therefore reject every hunk before Berry was compiled. I opened the companion apps fix here: https://github.com/apache/nuttx-apps/pull/3567 That fix normalizes the downloaded Berry `default/berry.c` before applying the existing patch in both Make and CMake fetch paths. Validated locally: - Fresh Berry archive patch apply path reproduces cleanly after normalization. - Make `sim:berry` build passes. - CMake/Ninja `sim:berry` testbuild passes. - Simulator smoke: `berry -v` => `Berry 1.1.0`, `berry -e print(40+2)` => `42`. - ESP32-C3 hardware smoke on `/dev/cu.usbmodem101`: flashed `esp32c3-devkit:usbconsole` with Berry enabled; `berry -v` and `berry -e print(40+2)` both work. Sorry for the churn on this one. The line-ending mismatch should be fixed by the apps PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
