From: Jim Meyering <meyering@redhat.com>
Date: Sun, 9 May 2010 16:52:36 +0000 (+0200)
Subject: tests: move sc_prohibit_always-defined_macros to gnulib's maint.mk
X-Git-Tag: v8.6~180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74f07c98d4aa5a9dc4e98f4accb6e4af68d70cc6;p=platform%2Fupstream%2Fcoreutils.git

tests: move sc_prohibit_always-defined_macros to gnulib's maint.mk

* cfg.mk (sc_prohibit_always-defined_macros): Remove it from here.
* gnulib: Update to latest, for a maint.mk that includes that rule.
---

diff --git a/cfg.mk b/cfg.mk
index 47919df..5a71a12 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -106,50 +106,6 @@ sc_x_sc_dist_check:
 		   ) | sort | uniq -u)"					\
 	  && { echo 'Makefile.am: $(sce) mismatch' >&2; exit 1; } || :;
 
-# ==================================================================
-gl_other_headers_ ?= \
-  intprops.h	\
-  openat.h	\
-  stat-macros.h
-
-# 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_)/\
-    and print $$1
-
-# Create a list of regular expressions matching the names
-# of macros that are guaranteed to be defined by parts of gnulib.
-.re-defmac:
-	@gen_h=$(gl_generated_headers_);				\
-	(cd $(gnulib_dir)/lib;						\
-	  for f in *.in.h $(gl_other_headers_); do			\
-	    perl -lne '$(gl_extract_significant_defines_)' $$f;		\
-	  done;								\
-	) | sort -u							\
-	  | grep -Ev '^ATTRIBUTE_NORETURN'				\
-	  | sed 's/^/^ *# *define /;s/$$/\\>/'				\
-	  > $@-t
-	@mv $@-t $@
-
-define gl_trap_
-  Exit () { set +e; (exit $$1); exit $$1; };				\
-  for sig in 1 2 3 13 15; do						\
-    eval "trap 'Exit $$(expr $$sig + 128)' $$sig";			\
-  done
-endef
-
-# Don't define macros that we already get from gnulib header files.
-sc_prohibit_always-defined_macros: .re-defmac
-	@if test -d $(gnulib_dir); then					\
-	  trap 'rc=$$?; rm -f .re-defmac; exit $$rc' 0;			\
-	  $(gl_trap_);							\
-	  grep -f .re-defmac $$($(VC_LIST_EXCEPT))			\
-	    && { echo '$(ME): define the above via some gnulib .h file'	\
-		  1>&2;  exit 1; } || :;				\
-	fi
-# ==================================================================
-
 # Create a list of regular expressions matching the names
 # of files included from system.h.  Exclude a couple.
 .re-list:
diff --git a/gnulib b/gnulib
index e6addf8..880f2b6 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e6addf84d6331d634b5d76db03f59851f3de8894
+Subproject commit 880f2b69df57af506439d6aaf1fe185a6f960e43