From 958833a0d3287bfdd4960a3e72cd11980bb9ca42 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 13 Mar 2022 21:52:04 -0400 Subject: newlib: integrate iconv update to maintainer build To help prevent people from missing running this script, integrate it into the build via maintainer mode. Also fix the inverted exit status to make this work correctly -- for some reason, it exited 1 when it worked, and 0 when it failed. --- newlib/Makefile.in | 18 +++++++++++++++++- newlib/libc/iconv/Makefile.inc | 18 ++++++++++++++++++ newlib/libc/iconv/ces/mkdeps.pl | 4 ++-- 3 files changed, 37 insertions(+), 3 deletions(-) (limited to 'newlib') diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 09d0ef5..2383d5a 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -3816,7 +3816,8 @@ EXTRA_DIST = $(am__append_42) PHONY = $(am__append_4) SUFFIXES = $(am__append_5) info_TEXINFOS = libc/libc.texi libm/libm.texi -noinst_DATA = libg.a $(am__append_1) $(am__append_2) $(am__append_3) +noinst_DATA = libg.a $(am__append_1) $(am__append_2) $(am__append_3) \ + $(libc_iconv_mkdeps_outputs) INSTALL_DATA_LOCAL = $(am__append_58) @NEWLIB_HW_FP_FALSE@MATHDIR = math @@ -4459,6 +4460,18 @@ libc_a_CPPFLAGS_libc_posix = -D_GNU_SOURCE @ENABLE_NEWLIB_ICONV_TRUE@ libc/iconv/ccs/binary/cns11643_plane1.cct \ @ENABLE_NEWLIB_ICONV_TRUE@ libc/iconv/ccs/binary/cns11643_plane2.cct \ @ENABLE_NEWLIB_ICONV_TRUE@ libc/iconv/ccs/binary/cns11643_plane14.cct +libc_iconv_mkdeps_outputs = \ + $(top_srcdir)/iconv.m4 \ + $(srcdir)/libc/iconv/ccs/ccsbi.c \ + $(srcdir)/libc/iconv/ccs/ccsbi.h \ + $(srcdir)/libc/iconv/ccs/ccsnames.h \ + $(srcdir)/libc/iconv/ces/cesbi.c \ + $(srcdir)/libc/iconv/ces/cesbi.h \ + $(srcdir)/libc/iconv/ces/cesdeps.h \ + $(srcdir)/libc/iconv/encoding.aliases \ + $(srcdir)/libc/iconv/lib/aliasesbi.c \ + $(srcdir)/libc/iconv/lib/encnames.h + @HAVE_XDR_DIR_TRUE@libc_xdr_ELIX_SOURCES = libc/xdr/xdr_private.c \ @HAVE_XDR_DIR_TRUE@ libc/xdr/xdr.c libc/xdr/xdr_float.c \ @HAVE_XDR_DIR_TRUE@ libc/xdr/xdr_array.c libc/xdr/xdr_mem.c \ @@ -24147,6 +24160,9 @@ libc_install-man: libc_man $(INSTALL_DATA) libc/*.3 $(DESTDIR)$(mandir)/man3/ install-man: libc_install-man +$(libc_iconv_mkdeps_outputs): @MAINTAINER_MODE_TRUE@ $(srcdir)/libc/iconv/ces/mkdeps.pl $(srcdir)/libc/iconv/lib/encoding.deps + $(AM_V_GEN)cd $(srcdir)/libc/iconv/ces && ./mkdeps.pl + @HAVE_LIBC_SYS_PHOENIX_DIR_TRUE@libc/sys/phoenix/crt0.o: libc/sys/phoenix/$(PHOENIX_MACHINE_DIR)/crt0.o @HAVE_LIBC_SYS_PHOENIX_DIR_TRUE@ $(AM_V_at)rm -f $@ @HAVE_LIBC_SYS_PHOENIX_DIR_TRUE@ $(AM_V_GEN)ln $< $@ >/dev/null 2>/dev/null || cp $< $@ diff --git a/newlib/libc/iconv/Makefile.inc b/newlib/libc/iconv/Makefile.inc index 77c0b05..49585c7 100644 --- a/newlib/libc/iconv/Makefile.inc +++ b/newlib/libc/iconv/Makefile.inc @@ -5,6 +5,24 @@ endif LIBC_CHAPTERS += %D%/iconv.tex +## If mkdeps.pl or encodings.deps changes, make sure to regenerate outputs. +%C%_mkdeps_outputs = \ + $(top_srcdir)/iconv.m4 \ + $(srcdir)/%D%/ccs/ccsbi.c \ + $(srcdir)/%D%/ccs/ccsbi.h \ + $(srcdir)/%D%/ccs/ccsnames.h \ + $(srcdir)/%D%/ces/cesbi.c \ + $(srcdir)/%D%/ces/cesbi.h \ + $(srcdir)/%D%/ces/cesdeps.h \ + $(srcdir)/%D%/encoding.aliases \ + $(srcdir)/%D%/lib/aliasesbi.c \ + $(srcdir)/%D%/lib/encnames.h + +$(%C%_mkdeps_outputs): @MAINTAINER_MODE_TRUE@ $(srcdir)/%D%/ces/mkdeps.pl $(srcdir)/%D%/lib/encoding.deps + $(AM_V_GEN)cd $(srcdir)/%D%/ces && ./mkdeps.pl + +noinst_DATA += $(%C%_mkdeps_outputs) + include %D%/ces/Makefile.inc include %D%/ccs/Makefile.inc include %D%/lib/Makefile.inc diff --git a/newlib/libc/iconv/ces/mkdeps.pl b/newlib/libc/iconv/ces/mkdeps.pl index b279fd4..649f2c5 100755 --- a/newlib/libc/iconv/ces/mkdeps.pl +++ b/newlib/libc/iconv/ces/mkdeps.pl @@ -200,7 +200,7 @@ delete $sections{$section_cesdeps}; print STDERR "Warning: section \"$_\" was ignored!\n" foreach (keys %sections); -exit 1; +exit 0; } # ============================================================================= @@ -213,7 +213,7 @@ exit 1; sub err($) { print STDERR "Error while running script.\n$_[0]\n"; - exit 0; + exit 1; } -- cgit v1.1