[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rockbox-cvs
Subject:    makefiles: Suppress stray backslash warnings with grep 3.8
From:       rockbox-gerrit-noreply--- via rockbox-cvs <rockbox-cvs () lists ! haxx ! se>
Date:       2023-03-21 8:48:33
Message-ID: 202303210848.32L8mXVg789158 () archos ! rockbox ! org
[Download RAW message or body]

commit ed7ab52e273e8fcf61c6e95ec28c392ff9ed4023
Author: Aidan MacDonald <amachronic@protonmail.com>
Date:   Tue Mar 14 13:05:49 2023 +0000

    makefiles: Suppress stray backslash warnings with grep 3.8
    
    GNU grep 3.8 warns about "\#" when compiling. The "#" has to be
    escaped for Makefiles and shell, but it isn't special to grep so
    grep thinks it's an invalid escape sequence.
    
    Change-Id: Ieb2607d42b7daa1939ca0101b915ec0c7afd4298

diff --git a/apps/apps.make b/apps/apps.make
index 6afcd12b5c..47b015bc92 100644
--- a/apps/apps.make
+++ b/apps/apps.make
@@ -24,7 +24,7 @@ $(BUILDDIR)/apps/features: $(APPSDIR)/features.txt  \
$(BUILDDIR)/firmware/common/  $(call PRINTS,PP $(<F))
 	$(SILENT)$(CC) $(PPCFLAGS) \
                  -E -P -imacros "config.h" -imacros "button.h" -x c $< | \
-		grep -v "^\#" | grep -v "^ *$$" > $(BUILDDIR)/apps/features; \
+		grep -v "^#" | grep -v "^ *$$" > $(BUILDDIR)/apps/features; \
 
 $(BUILDDIR)/apps/genlang-features:  $(BUILDDIR)/apps/features
 	$(call PRINTS,GEN $(subst $(BUILDDIR)/,,$@))tr \\n : < $< > $@
diff --git a/manual/Makefile b/manual/Makefile
index e1d3c1fb81..6718085e30 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -59,7 +59,7 @@ $(OBJDIR)/features.tex: $(ROOTDIR)/apps/features.txt
 	$(SILENT) for f in \
 	    $$(cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
 	       $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" \
-	       -imacros "button.h" - | grep -v "^\#" | grep -v "^$$"); \
+	       -imacros "button.h" - | grep -v "^#" | grep -v "^$$"); \
 	    do feat="$$feat\\n\\\\edef\\\\UseOption{\\\\UseOption,$$f}"; done ; \
 	printf "$$feat" > $@
 
diff --git a/tools/functions.make b/tools/functions.make
index 518b945320..d9acbba2ba 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -15,11 +15,11 @@
 # The sed line is to prepend the directory to all source files
 
 preprocess = $(shell $(CC) $(PPCFLAGS) $(2) -E -P -x c -include config.h $(1) | \
-		grep -v '^\#' | grep -v "^ *$$" | \
+		grep -v '^#' | grep -v "^ *$$" | \
 		sed -e 's:^..*:$(dir $(1))&:')
 
-preprocess2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -E -P -x c -include config.h $(1) \
                | \
-		grep -v '^\#' | grep -v "^$$" > $(2)
+preprocess2file = $(shell $(CC) $(PPCFLAGS) $(3) -E -P -x c -include config.h $(1) | \
\ +		grep -v '^#' | grep -v "^$$" > $(2))
 
 asmdefs2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -S -x c -o - -include config.h $(1) | \
\  perl -ne 'if(/^_?AD_(\w+):$$/){$$var=$$1}else{/^\W\.(?:word|long)\W(.*)$$/ && \
                $$var && print "\#define $$var $$1\n";$$var=0}' > $(2)
diff --git a/tools/makesrc.inc b/tools/makesrc.inc
index 846df8cb9e..55c1bbe98d 100644
--- a/tools/makesrc.inc
+++ b/tools/makesrc.inc
@@ -11,4 +11,4 @@
 
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
 $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - 2>/dev/null \
-| grep -v "^\#")
+| grep -v "^#")
diff --git a/utils/hwstub/stub/hwstub.make b/utils/hwstub/stub/hwstub.make
index d51ca1df95..3938b0b070 100644
--- a/utils/hwstub/stub/hwstub.make
+++ b/utils/hwstub/stub/hwstub.make
@@ -8,7 +8,7 @@ LDFLAGS=-lgcc -Os -nostdlib -T$(TMP_LDS) -Wl,-Map,$(TMP_MAP) \
$(INCLUDES) -L$(BUI  
 SRC:=$(shell cat $(ROOT_DIR)/SOURCES | $(CC) $(INCLUDES) \
     $(DEFINES) -E -P -include "config.h" - 2>/dev/null \
-    | grep -v "^\#")
+    | grep -v "^#")
 SRC:=$(foreach src,$(SRC),$(BUILD_DIR)/$(src))
 OBJ=$(SRC:.c=.o)
 OBJ:=$(OBJ:.S=.o)
-- 
rockbox-cvs mailing list
rockbox-cvs@lists.haxx.se
https://lists.haxx.se/mailman/listinfo/rockbox-cvs


[prev in list] [next in list] [prev in thread] [next in thread]