This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 6367449 system/embedlog: Fix sed command usage for macOS
6367449 is described below
commit 6367449751cb3db585bb7c044204c09f8689ca00
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Thu Jul 29 12:34:23 2021 +0900
system/embedlog: Fix sed command usage for macOS
The `sed` command only with `-i` option has not been supported
on macOS platform, and so it causes build error on macOS.
Fix Makefile so that it passes on all platforms without using
`-i` option.
---
system/embedlog/Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile
index 69b4662..dea4160 100644
--- a/system/embedlog/Makefile
+++ b/system/embedlog/Makefile
@@ -230,9 +230,10 @@ $(EMBEDLOG_SOURCES)/include/embedlog.h:
$(EMBEDLOG_SOURCES)/include/embedlog.h.i
-e "s/@ENABLE_OUT_TTY@/$(CONFIG_EMBEDLOG_ENABLE_OUT_TTY)/" \
-e "s/@ENABLE_PREFIX@/$(CONFIG_EMBEDLOG_ENABLE_PREFIX)/" \
-e "s/@ENABLE_OUT_CUSTOM@/$(CONFIG_EMBEDLOG_ENABLE_OUT_CUSTOM)/" \
- -e "s/@ENABLE_PTHREAD@/$(CONFIG_EMBEDLOG_ENABLE_PTHREAD)/" $< > $@
- $(Q) sed -i -e "s/^#if y$$/#if 1/" \
- -e "s/^#if $$/#if 0/" -e "s/^#if n$$/#if 0/" $@
+ -e "s/@ENABLE_PTHREAD@/$(CONFIG_EMBEDLOG_ENABLE_PTHREAD)/" \
+ -e "s/^#if y$$/#if 1/" \
+ -e "s/^#if $$/#if 0/" \
+ -e "s/^#if n$$/#if 0/" $< > $@
create_includes: $(EMBEDLOG_SOURCES)/include/embedlog.h
$(Q) $(CP) $< $(APPDIR)/include/system
