speccy88 commented on code in PR #3567:
URL: https://github.com/apache/nuttx-apps/pull/3567#discussion_r3489503655
##########
interpreters/berry/Makefile:
##########
@@ -71,6 +73,7 @@ $(BERRY_UNPACK): $(BERRY_ARCHIVE)
$(Q) unzip -q -o $(BERRY_ARCHIVE)
$(call DELDIR, $(BERRY_UNPACK))
$(Q) mv berry-$(BERRY_COMMIT_ID) $(BERRY_UNPACK)
+ $(Q) python3 $(BERRY_FIX_CRLF) $(BERRY_MAIN)
Review Comment:
I already upstreamed the Berry-side change here:
https://github.com/berry-lang/berry/pull/539. That PR is approved, but it has
not been merged yet.
For this NuttX apps PR, I normalized the downloaded `default/berry.c` before
applying the existing patch because the current pinned Berry archive still
contains CRLF line endings, while the NuttX patch is LF. This keeps the patch
file in the normal NuttX text format and makes both Make and CMake fetch paths
apply it reliably.
If you prefer, I can switch this PR to a CRLF-formatted patch instead. Once
berry-lang/berry#539 is merged, I can also update the pinned Berry commit and
remove the local NuttX patch entirely.
--
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]
