From: Jim Meyering <meyering@redhat.com>
Date: Wed, 15 Apr 2009 18:18:24 +0000 (+0200)
Subject: maint: clean up skipped syntax-check rules
X-Git-Tag: v7.3~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a46c077467e8b9eac3b875ac0ebab8ff9e713d24;p=thirdparty%2Fcoreutils.git

maint: clean up skipped syntax-check rules

* cfg.mk (local-checks-to-skip): Remove patch-check and changelog-check.
* maint.mk (patch-check): Remove rule.
(local-checks-available): Remove patch-check.
(changelog-check): Remove rule.
---

diff --git a/cfg.mk b/cfg.mk
index 7f4cdd2656..b356e1a6d8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,12 +31,7 @@ url_dir_list = \
 gpg_key_ID = B9AB9A16
 
 # Tests not to run as part of "make distcheck".
-# Exclude changelog-check here so that there's less churn in ChangeLog
-# files -- otherwise, you'd need to have the upcoming version number
-# at the top of the file for each `make distcheck' run.
-local-checks-to-skip = changelog-check strftime-check
-
-local-checks-to-skip += patch-check
+local-checks-to-skip = strftime-check
 
 # The local directory containing the checked-out copy of gnulib used in this
 # release.  Used solely to get gnulib's SHA1 for the "announcement" target.
diff --git a/maint.mk b/maint.mk
index 1e6b13fe84..8777a99af8 100644
--- a/maint.mk
+++ b/maint.mk
@@ -72,7 +72,7 @@ syntax-check-rules := $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
 .PHONY: $(syntax-check-rules)
 
 local-checks-available = \
-  patch-check $(syntax-check-rules) \
+  $(syntax-check-rules) \
   makefile-check check-AUTHORS
 .PHONY: $(local-checks-available)
 
@@ -483,33 +483,6 @@ update-NEWS-hash: NEWS
 	perl -pi -e 's/^(old_NEWS_hash = ).*/$${1}'"$(NEWS_hash)/" \
 	  $(srcdir)/cfg.mk
 
-epoch_date = 1970-01-01 00:00:00.000000000 +0000
-ALL_RECURSIVE_TARGETS += patch-check
-# Ensure that the c99-to-c89 patch applies cleanly.
-patch-check:
-	rm -rf src-c89 $@.1 $@.2
-	cp -a $(srcdir)/src src-c89
-	if test "x$(srcdir)" != x.; then \
-	  cp -a src/* src-c89; \
-	  dotfiles=`ls src/.[!.]* 2>/dev/null`; \
-	  test -z "$$dotfiles" || cp -a src/.[!.]* src-c89; \
-	fi
-	(cd src-c89; patch -p1 -V never --fuzz=0) < $(srcdir)/src/c99-to-c89.diff \
-	  > $@.1 2>&1
-	if test "$(REGEN_PATCH)" = yes; then			\
-	  diff -upr $(srcdir)/src src-c89 | sed 's,$(srcdir)/src-c89/,src/,'	\
-	    | grep -vE '^(Only in|File )'			\
-	    | perl -pe 's/^((?:\+\+\+|---) \S+\t).*/$${1}$(epoch_date)/;' \
-	       -e 's/^ $$//'					\
-	    > new-diff || : ; fi
-	grep -v '^patching file ' $@.1 > $@.2 || :
-	msg=ok; test -s $@.2 && msg='fuzzy patch' || : ;	\
-	rm -f src-c89/*.o || msg='rm failed';			\
-	$(MAKE) -C src-c89 CFLAGS='-Wdeclaration-after-statement -Werror' \
-	  || msg='compile failure with extra options';		\
-	test "$$msg" = ok && rm -rf src-c89 $@.1 $@.2 || echo "$$msg" 1>&2; \
-	test "$$msg" = ok
-
 ALL_RECURSIVE_TARGETS += check-AUTHORS
 check-AUTHORS:
 	$(MAKE) -C src $@
@@ -535,15 +508,6 @@ news-date-check: NEWS
 	  exit 1;							\
 	fi
 
-changelog-check:
-	if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$'	\
-	    >/dev/null; then						\
-	  :;								\
-	else								\
-	  echo "$(VERSION) not in ChangeLog" 1>&2;			\
-	  exit 1;							\
-	fi
-
 sc_makefile_TAB_only_indentation:
 	@grep -nE '^	[ ]{8}'						\
 	    $$($(VC_LIST_EXCEPT) | grep -E 'akefile|\.mk$$')		\