Skip to content

Commit abab5c4

Browse files
committed
build-aux: remove some syntax-check cruft
sc_proper_name_utf8_requires_ICONV looks for Makefile.am files, so is not going to work correctly with meson, nor did we ever use the GNULIB "proper_name_utf8" function. The 'today' variable is not referenced anywhere. The 'writable-files' target is not used anywhere sc_prohibit_reversed_compare_failure only checks 'init.sh' which does not exist in libvirt. Reviewed-by: Ján Tomko <[email protected]> Signed-off-by: Daniel P. Berrangé <[email protected]>
1 parent 90df0f8 commit abab5c4

File tree

1 file changed

+0
-54
lines changed

1 file changed

+0
-54
lines changed

build-aux/syntax-check.mk

-54
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ VC_LIST_EXCEPT = \
7272
| $(GREP) -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \
7373
$(_prepend_srcdir_prefix)
7474

75-
# Override this in syntax-check.mk if you are using a different format in your
76-
# NEWS file.
77-
today = $(shell date +%Y-%m-%d)
78-
7975
# Prevent programs like 'sort' from considering distinct strings to be equal.
8076
# Doing it here saves us from having to set LC_ALL elsewhere in this file.
8177
export LC_ALL = C
@@ -1744,29 +1740,6 @@ sc_prohibit_test_double_equal:
17441740
halt='use "test x = x", not "test x =''= x"' \
17451741
$(_sc_search_regexp)
17461742
1747-
# Each program that uses proper_name_utf8 must link with one of the
1748-
# ICONV libraries. Otherwise, some ICONV library must appear in LDADD.
1749-
# The perl -0777 invocation below extracts the possibly-multi-line
1750-
# definition of LDADD from the appropriate Makefile.am and exits 0
1751-
# when it contains "ICONV".
1752-
sc_proper_name_utf8_requires_ICONV:
1753-
@progs=$$($(VC_LIST_EXCEPT) \
1754-
| xargs $(GREP) -l 'proper_name_utf8 ''("'); \
1755-
if test "x$$progs" != x; then \
1756-
fail=0; \
1757-
for p in $$progs; do \
1758-
dir=$$(dirname "$$p"); \
1759-
perl -0777 \
1760-
-ne 'exit !(/^LDADD =(.+?[^\\]\n)/ms && $$1 =~ /ICONV/)' \
1761-
$$dir/Makefile.am && continue; \
1762-
base=$$(basename "$$p" .c); \
1763-
$(GREP) "$${base}_LDADD.*ICONV)" $$dir/Makefile.am > /dev/null \
1764-
|| { fail=1; echo 1>&2 "$(ME): $$p uses proper_name_utf8"; }; \
1765-
done; \
1766-
test $$fail = 1 && \
1767-
{ echo 1>&2 '$(ME): the above do not link with any ICONV library'; \
1768-
exit 1; } || :; \
1769-
fi
17701743
17711744
# Warn about "c0nst struct Foo const foo[]",
17721745
# but not about "char const *const foo" or "#define const const".
@@ -1828,33 +1801,6 @@ sc_po_check:
18281801
rm -f $@-1 $@-2; \
18291802
fi
18301803
1831-
# Check that 'make alpha' will not fail at the end of the process,
1832-
# i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
1833-
# and is read-only.
1834-
writable-files:
1835-
$(AM_V_GEN)if test -d $(release_archive_dir); then \
1836-
for file in $(DIST_ARCHIVES); do \
1837-
for p in ./ $(release_archive_dir)/; do \
1838-
test -e $$p$$file || continue; \
1839-
test -w $$p$$file \
1840-
|| { echo ERROR: $$p$$file is not writable; fail=1; }; \
1841-
done; \
1842-
done; \
1843-
test "$$fail" && exit 1 || : ; \
1844-
else :; \
1845-
fi
1846-
1847-
1848-
# BRE regex of file contents to identify a test script.
1849-
_test_script_regex ?= \<init\.sh\>
1850-
1851-
# In tests, use "compare expected actual", not the reverse.
1852-
sc_prohibit_reversed_compare_failure:
1853-
@prohibit='\<compare [^ ]+ ([^ ]*exp|/dev/null)' \
1854-
containing='$(_test_script_regex)' \
1855-
halt='reversed compare arguments' \
1856-
$(_sc_search_regexp)
1857-
18581804
# #if HAVE_... will evaluate to false for any non numeric string.
18591805
# That would be flagged by using -Wundef, however gnulib currently
18601806
# tests many undefined macros, and so we can't enable that option.

0 commit comments

Comments
 (0)