[libvirt PATCH] build-aux: remove some syntax-check cruft

Ján Tomko jtomko at redhat.com
Tue Aug 4 13:39:44 UTC 2020


On a Tuesday in 2020, Daniel P. Berrangé wrote:
>sc_proper_name_utf8_requires_ICONV looks for Makefile.am files, so is
>not going to work correctly with meson.
>

Nor do we use proper_name_utf8

>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.
>
>Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
>---
> build-aux/syntax-check.mk | 54 ---------------------------------------
> 1 file changed, 54 deletions(-)
>
>diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
>index 9256532ab3..6eb59cf90e 100644
>--- a/build-aux/syntax-check.mk
>+++ b/build-aux/syntax-check.mk

[...]

>-# Each program that uses proper_name_utf8 must link with one of the
>-# ICONV libraries.  Otherwise, some ICONV library must appear in LDADD.
>-# The perl -0777 invocation below extracts the possibly-multi-line
>-# definition of LDADD from the appropriate Makefile.am and exits 0
>-# when it contains "ICONV".
>-sc_proper_name_utf8_requires_ICONV:
>-	@progs=$$($(VC_LIST_EXCEPT)					\
>-		    | xargs $(GREP) -l 'proper_name_utf8 ''("');	\
>-	if test "x$$progs" != x; then					\
>-	  fail=0;							\
>-	  for p in $$progs; do						\
>-	    dir=$$(dirname "$$p");					\
>-	    perl -0777							\
>-	      -ne 'exit !(/^LDADD =(.+?[^\\]\n)/ms && $$1 =~ /ICONV/)'	\
>-	      $$dir/Makefile.am && continue;				\

Quite tame for Makefile-quoted Perl.

>-	    base=$$(basename "$$p" .c);					\
>-	    $(GREP) "$${base}_LDADD.*ICONV)" $$dir/Makefile.am > /dev/null	\
>-	      || { fail=1; echo 1>&2 "$(ME): $$p uses proper_name_utf8"; }; \
>-	  done;								\
>-	  test $$fail = 1 &&						\
>-	    { echo 1>&2 '$(ME): the above do not link with any ICONV library'; \
>-	      exit 1; } || :;						\
>-	fi
>

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200804/f8657d66/attachment-0001.sig>


More information about the libvir-list mailing list