maint.mk: gnulib doesn't guarantee NSIG

Gnulib conditionally defines NSIG to 32 for some platforms.  But since
NSIG is not mandated by standards, and there are platforms with 64
signals, we should not promise that NSIG is guaranteed.

* top/maint.mk (gl_extract_significant_defines_): Exclude NSIG.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 9ddf925546da2cfe9edddb7df34431e3db7a5528..9af20597eda039a3178f69074e296af56779027e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Eric Blake  <eblake@redhat.com>
+
+       maint.mk: gnulib doesn't guarantee NSIG
+       * top/maint.mk (gl_extract_significant_defines_): Exclude NSIG.
+
 2010-05-10  Peter O'Gorman  <pogma@thewrittenword.com>
 
        test-pwrite.c: Remove unused variable declaration.

diff --git a/top/maint.mk b/top/maint.mk
index 867e4be5e579626a23d9502b9a0dd75e750fa2c8..54fcbe9b262c144dc849ac8c9055fe0256b6a37d 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -674,7 +674,9 @@ gl_other_headers_ ?= \
 # Perl -lne code to extract "significant" cpp-defined symbols from a
 # gnulib header file, eliminating a few common false-positives.
 gl_extract_significant_defines_ = \
-  /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/ && $$2 !~ /(?:rpl_|_used_without_)/\
+  /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/\
+    && $$2 !~ /(?:rpl_|_used_without_)/\
+    && $$1 !~ /^(NSIG|ATTRIBUTE_NORETURN)/\
     and print $$1
 
 # Create a list of regular expressions matching the names
@@ -686,7 +688,6 @@ define def_sym_regex
            perl -lne '$(gl_extract_significant_defines_)' $$f;         \
          done;                                                         \
        ) | sort -u                                                     \
-         | grep -Ev '^ATTRIBUTE_NORETURN'                              \
          | sed 's/^/^ *# *define /;s/$$/\\>/'
 endef