bug#21114: [PATCH 1/4] Fix the rule to check for new signals and errors

bug#21114: [PATCH 1/4] Fix the rule to check for new signals and errors

[David Michael]

* .gitignore (/libguile/*.NEW): New pattern.
* libguile/Makefile.am (chknew-E chknew-SIG): Remove the line
  continuation after the targets, and include numbers in the
  recipe's signal/error regexp to catch names like E2BIG.
---


This patch series makes a few updates to the generation of the lists of
signal and error signals.  This first one makes the chknew targets work
again.  GNU Make says there is no such target without this.


 .gitignore           | 1 +
 libguile/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6375f2b..3a2f743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,6 +160,7 @@ INSTALL
 /test-suite/standalone/test-scm-values
 /test-suite/standalone/test-scm-to-latin1-string
 /test-suite/standalone/test-scm-c-bind-keyword-arguments
+/libguile/*.NEW
 /libguile/vm-operations.h
 /test-suite/standalone/test-foreign-object-c
 /test-suite/standalone/test-srfi-4
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 8302a18..dfa3be0 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -815,13 +815,13 @@ MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 
 # Write $(srcdir)/cpp-{E,SIG}.syms.NEW if there are any not-yet-seen
 # ("new" to us) E* or SIG* symbols in <errno.h> or <signal.h>, respectively.
-chknew-E chknew-SIG:						\
+chknew-E chknew-SIG:
 	@bit=`echo $@ | sed s/^chknew-//` ;			\
 	old="$(srcdir)/cpp-$$bit.syms" ;			\
 	echo "#include <$${bit}.h>"				\
 	 | sed 's/E/errno/;s/SIG/signal/'			\
 	 | gcc -dM -E -						\
-	 | sed 's/^#define //;/^'$$bit'[A-Z][A-Z]*/!d;s/ .*//'	\
+	 | sed 's/^#define //;/^'$$bit'[0-9A-Z][0-9A-Z]*/!d;s/ .*//'	\
 	 | sort | diff -u $$old - | sed '1,2d;/^+/!d;s/^.//'	\
 	 > TMP ;						\
 	if [ -s TMP ] ; then new="$$old.NEW" ;			\
-- 
2.1.0

bug#21114: [PATCH 1/4] Fix the rule to check for new signals and errors

[Ludovic Courtès]

David Michael <fedora.dm0@gmail.com> skribis:

> * .gitignore (/libguile/*.NEW): New pattern.
> * libguile/Makefile.am (chknew-E chknew-SIG): Remove the line
>   continuation after the targets, and include numbers in the
>   recipe's signal/error regexp to catch names like E2BIG.
> ---
>
>
> This patch series makes a few updates to the generation of the lists of
> signal and error signals.  This first one makes the chknew targets work
> again.  GNU Make says there is no such target without this.

Indeed.

Applied in 9a4215b, thanks.

Ludo’.