From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 66CE8385782D; Thu, 17 Mar 2022 02:00:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66CE8385782D Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: integrate iconv update to maintainer build X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: f2471da7db7d49e384007c41759e4e8cb3d8340c X-Git-Newrev: 958833a0d3287bfdd4960a3e72cd11980bb9ca42 Message-Id: <20220317020032.66CE8385782D@sourceware.org> Date: Thu, 17 Mar 2022 02:00:32 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Mar 2022 02:00:32 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D958833a0d32= 87bfdd4960a3e72cd11980bb9ca42 commit 958833a0d3287bfdd4960a3e72cd11980bb9ca42 Author: Mike Frysinger Date: Sun Mar 13 21:52:04 2022 -0400 newlib: integrate iconv update to maintainer build =20 To help prevent people from missing running this script, integrate it into the build via maintainer mode. =20 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. Diff: --- newlib/Makefile.in | 18 +++++++++++++++++- newlib/libc/iconv/Makefile.inc | 18 ++++++++++++++++++ newlib/libc/iconv/ces/mkdeps.pl | 4 ++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 09d0ef5bf..2383d5ae4 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -3816,7 +3816,8 @@ EXTRA_DIST =3D $(am__append_42) PHONY =3D $(am__append_4) SUFFIXES =3D $(am__append_5) info_TEXINFOS =3D libc/libc.texi libm/libm.texi -noinst_DATA =3D libg.a $(am__append_1) $(am__append_2) $(am__append_3) +noinst_DATA =3D libg.a $(am__append_1) $(am__append_2) $(am__append_3) \ + $(libc_iconv_mkdeps_outputs) INSTALL_DATA_LOCAL =3D $(am__append_58) @NEWLIB_HW_FP_FALSE@MATHDIR =3D math =20 @@ -4459,6 +4460,18 @@ libc_a_CPPFLAGS_libc_posix =3D -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 =3D \ + $(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 =3D 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 =20 +$(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/nul= l || cp $< $@ diff --git a/newlib/libc/iconv/Makefile.inc b/newlib/libc/iconv/Makefile.inc index 77c0b0599..49585c73d 100644 --- a/newlib/libc/iconv/Makefile.inc +++ b/newlib/libc/iconv/Makefile.inc @@ -5,6 +5,24 @@ endif =20 LIBC_CHAPTERS +=3D %D%/iconv.tex =20 +## If mkdeps.pl or encodings.deps changes, make sure to regenerate outputs. +%C%_mkdeps_outputs =3D \ + $(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 +=3D $(%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 b279fd4e8..649f2c5fe 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); =20 -exit 1; +exit 0; } =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D @@ -213,7 +213,7 @@ exit 1; sub err($) { print STDERR "Error while running script.\n$_[0]\n"; - exit 0; + exit 1; }