From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 1D2EE3858C3A for ; Sat, 22 Jan 2022 04:32:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1D2EE3858C3A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id ADEF134356A; Sat, 22 Jan 2022 04:32:11 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 2/5] newlib: libc: include all chapters all the time in the manual Date: Fri, 21 Jan 2022 23:32:05 -0500 Message-Id: <20220122043208.21962-3-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220122043208.21962-1-vapier@gentoo.org> References: <20220122043208.21962-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jan 2022 04:32:13 -0000 THe stdio subdir is actually required by the documentation. The stdio/def is handled dynamically, but libc.texi always expects it to be included, and fails if it isn't. So making it required when building docs is safe. The xdr subdir is handled dynamically, but it doesn't include any docs, so the dynamic logic isn't (currently) adding any value. So making it required when building docs is safe. That leaves: iconv, stdio64, posix, and signal subdirs. The chapters have a little disclaimer saying they are system-dependent, but even then, imo having stable manuals regardless of the target is preferable, and we can add more disclaimer language to these chapters if we want. This doesn't touch the man page codepaths, just the info/pdf. --- newlib/libc/Makefile.am | 69 ++++------------------ newlib/libc/Makefile.in | 75 ++++-------------------- newlib/libc/argz/Makefile.in | 5 -- newlib/libc/configure | 24 +------- newlib/libc/configure.ac | 15 ----- newlib/libc/ctype/Makefile.in | 5 -- newlib/libc/errno/Makefile.in | 5 -- newlib/libc/iconv/Makefile.in | 5 -- newlib/libc/iconv/ccs/Makefile.in | 5 -- newlib/libc/iconv/ccs/binary/Makefile.in | 5 -- newlib/libc/iconv/ces/Makefile.in | 5 -- newlib/libc/iconv/lib/Makefile.in | 5 -- newlib/libc/libc.texi | 18 ------ newlib/libc/locale/Makefile.in | 5 -- newlib/libc/misc/Makefile.in | 5 -- newlib/libc/posix/Makefile.in | 5 -- newlib/libc/reent/Makefile.in | 5 -- newlib/libc/search/Makefile.in | 5 -- newlib/libc/signal/Makefile.in | 5 -- newlib/libc/ssp/Makefile.in | 5 -- newlib/libc/stdio/Makefile.in | 5 -- newlib/libc/stdio64/Makefile.in | 5 -- newlib/libc/stdlib/Makefile.in | 5 -- newlib/libc/string/Makefile.in | 5 -- newlib/libc/syscalls/Makefile.in | 5 -- newlib/libc/time/Makefile.in | 5 -- newlib/libc/unix/Makefile.in | 5 -- newlib/libc/xdr/Makefile.in | 5 -- 28 files changed, 22 insertions(+), 294 deletions(-) diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index cdeaf84c4e21..62e04abcfbc1 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -128,12 +128,12 @@ sys/crt0.o: ; @true SUBDEFS = \ stdlib/stmp-def \ ctype/stmp-def \ - $(LIBC_STDIO_DEF) \ - $(LIBC_STDIO64_DEF) \ - $(LIBC_POSIX_DEF) \ - $(LIBC_XDR_DEF) \ + stdio/stmp-def \ + stdio64/stmp-def \ + posix/stmp-def \ + xdr/stmp-def \ string/stmp-def \ - $(LIBC_SIGNAL_DEF) \ + signal/stmp-def \ time/stmp-def \ locale/stmp-def \ reent/stmp-def \ @@ -142,55 +142,9 @@ SUBDEFS = \ # ditto for stmp-xml files in each subdirectory which builds .xml files SUBXMLS = $(SUBDEFS:stmp-def=stmp-xml) -libc.info: sigset.texi stdio64.texi posix.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) +libc.info: targetdep.tex $(SUBDEFS) -libc.dvi: sigset.texi stdio64.texi posix.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) - -stmp-sigset: config.status - if test -n "$(LIBC_SIGNAL_LIB)"; then \ - echo "@set SIGNALS" >tmp-sigset.texi; \ - else \ - echo "@clear SIGNALS" >tmp-sigset.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-sigset.texi sigset.texi - touch $@ - -sigset.texi: stmp-sigset ; @true - -stmp-iconvset: config.status - if test -n "$(NEWLIB_ICONV_LIBS)"; then \ - echo "@set ICONV" >tmp-iconvset.texi; \ - else \ - echo "@clear ICONV" >tmp-iconvset.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-iconvset.texi iconvset.texi - touch $@ - -iconvset.texi: stmp-iconvset ; @true - -stmp-stdio64: config.status - if test -n "$(LIBC_STDIO64_LIB)"; then \ - echo "@set STDIO64" >tmp-stdio64.texi; \ - else \ - echo "@clear STDIO64" >tmp-stdio64.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-stdio64.texi stdio64.texi - touch $@ - -stdio64.texi: stmp-stdio64 ; @true - -stmp-posix: config.status - if test -n "$(LIBC_POSIX_LIB)"; then \ - echo "@set POSIX" >tmp-posix.texi; \ - else \ - echo "@clear POSIX" >tmp-posix.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-posix.texi posix.texi - touch $@ - -posix.texi: stmp-posix ; @true +libc.dvi: targetdep.tex $(SUBDEFS) stmp-targetdep: force rm -f tmp-targetdep.texi @@ -210,8 +164,7 @@ $(SUBDEFS): stmp-targetdep ; @true TEXINFO_TEX = ../../texinfo/texinfo.tex info_TEXINFOS = libc.texi -libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) +libc_TEXINFOS = targetdep.tex $(SUBDEFS) docbook-recursive: force for d in $(SUBDIRS); do \ @@ -234,10 +187,8 @@ install-man: man force: CLEANFILES = $(CRT0) \ - sigset.texi stmp-sigset \ - stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \ - tmp-sigset.texi tmp-iconvset.texi \ - tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \ + targetdep.tex stmp-targetdep \ + tmp-targetdep.texi \ *.xml *.3 ACLOCAL_AMFLAGS = -I .. -I ../.. -I ../../config diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac index 9ed0a5a2e059..311d8fb50ede 100644 --- a/newlib/libc/configure.ac +++ b/newlib/libc/configure.ac @@ -71,73 +71,58 @@ dnl for the library and an automake conditional for whether we should dnl build the library. LIBC_SIGNAL_LIB= -LIBC_SIGNAL_DEF= if test -n "${signal_dir}"; then if test "${use_libtool}" = "yes"; then LIBC_SIGNAL_LIB=${signal_dir}/lib${signal_dir}.${aext} else LIBC_SIGNAL_LIB=${signal_dir}/lib.${aext} fi - LIBC_SIGNAL_DEF=${signal_dir}/stmp-def fi AC_SUBST(LIBC_SIGNAL_LIB) -AC_SUBST(LIBC_SIGNAL_DEF) AM_CONDITIONAL(HAVE_SIGNAL_DIR, test x${signal_dir} != x) LIBC_STDIO_LIB= -LIBC_STDIO_DEF= if test -n "${stdio_dir}"; then if test "${use_libtool}" = "yes"; then LIBC_STDIO_LIB=${stdio_dir}/lib${stdio_dir}.${aext} else LIBC_STDIO_LIB=${stdio_dir}/lib.${aext} fi - LIBC_STDIO_DEF=${stdio_dir}/stmp-def fi AC_SUBST(LIBC_STDIO_LIB) -AC_SUBST(LIBC_STDIO_DEF) AM_CONDITIONAL(HAVE_STDIO_DIR, test x${stdio_dir} != x) LIBC_STDIO64_LIB= -LIBC_STDIO64_DEF= if test -n "${stdio64_dir}"; then if test "${use_libtool}" = "yes"; then LIBC_STDIO64_LIB=${stdio64_dir}/lib${stdio64_dir}.${aext} else LIBC_STDIO64_LIB=${stdio64_dir}/lib.${aext} fi - LIBC_STDIO64_DEF=${stdio64_dir}/stmp-def fi AC_SUBST(LIBC_STDIO64_LIB) -AC_SUBST(LIBC_STDIO64_DEF) AM_CONDITIONAL(HAVE_STDIO64_DIR, test x${stdio64_dir} != x) LIBC_POSIX_LIB= -LIBC_POSIX_DEF= if test -n "${posix_dir}"; then if test "${use_libtool}" = "yes"; then LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext} else LIBC_POSIX_LIB=${posix_dir}/lib.${aext} fi - LIBC_POSIX_DEF=${posix_dir}/stmp-def fi AC_SUBST(LIBC_POSIX_LIB) -AC_SUBST(LIBC_POSIX_DEF) AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x) LIBC_XDR_LIB= -LIBC_XDR_DEF= if test -n "${xdr_dir}"; then if test "${use_libtool}" = "yes"; then LIBC_XDR_LIB=${xdr_dir}/lib${xdr_dir}.${aext} else LIBC_XDR_LIB=${xdr_dir}/lib.${aext} fi - LIBC_XDR_DEF=${xdr_dir}/stmp-def fi AC_SUBST(LIBC_XDR_LIB) -AC_SUBST(LIBC_XDR_DEF) AM_CONDITIONAL(HAVE_XDR_DIR, test x${xdr_dir} != x) LIBC_SYSCALL_LIB= diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in index a6bd94360c77..a5b242b98b84 100644 --- a/newlib/libc/iconv/ccs/binary/Makefile.in +++ b/newlib/libc/iconv/ccs/binary/Makefile.in @@ -193,18 +193,13 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@ -LIBC_POSIX_DEF = @LIBC_POSIX_DEF@ LIBC_POSIX_LIB = @LIBC_POSIX_LIB@ -LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@ LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@ -LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@ LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@ -LIBC_STDIO_DEF = @LIBC_STDIO_DEF@ LIBC_STDIO_LIB = @LIBC_STDIO_LIB@ LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@ LIBC_SYS_LIB = @LIBC_SYS_LIB@ LIBC_UNIX_LIB = @LIBC_UNIX_LIB@ -LIBC_XDR_DEF = @LIBC_XDR_DEF@ LIBC_XDR_LIB = @LIBC_XDR_LIB@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/newlib/libc/libc.texi b/newlib/libc/libc.texi index 0cab22036dee..d217d8118277 100644 --- a/newlib/libc/libc.texi +++ b/newlib/libc/libc.texi @@ -132,44 +132,26 @@ into another language, under the above conditions for modified versions. @node Top @top The Red Hat newlib C Library -@c The menu contents depend on the configuration, so we include them -@c as a separate file - -@c switch to set SIGNALS on or off, according to whether config picks up -@c signal subdirectory: -@include sigset.texi -@include posix.texi -@include stdio64.texi -@include iconvset.texi - @menu * Introduction:: * Stdlib:: * Ctype:: * Stdio:: -@ifset STDIO64 * Stdio64:: -@end ifset * Strings:: * Wchar strings:: -@ifset SIGNALS * Signals:: -@end ifset * Timefns:: * Locale:: * Reentrancy:: * Misc:: -@ifset POSIX * Posix:: -@end ifset * Syscalls:: * Arglists:: -@ifset ICONV * Iconv:: -@end ifset * Overflow Protection:: * Document Index:: -- 2.34.1