reverted: --- dist-3.5-236/ChangeLog +++ dist-3.5-236.orig/ChangeLog @@ -61,7 +61,7 @@ Added the srcdir support to "configure" now that we have src.U. + Documented the runnning environment and the src.U unit in - Documented the running environment and the src.U unit in the metaconfig man page. The $_a and $_o are also mentionned. All the generated scripts must now start with a "$startsh" to ensure proper shell execution. @@ -79,7 +79,7 @@ * bin/packinit.SH: Fixed one wrong ':' comment in .package. + * jmake/files/Jmake.rules: Now handles USRINC for dependencies. - * jmake/files/Jmake.rules: Now handles USRINC for dependencies. Smarter about dependencies computation. * jmake/files/Jmake.tmpl: Lex path can now be configured. @@ -109,13 +109,13 @@ * mcon/U/Instruct.U: Logname / whoami sequence rewritten to use case. + * mcon/U/Loc.U: Allow users to specify paths on the command line. - * mcon/U/Loc.U: Allow users to specify paths on the command line. Will now substitute cp for ln if not supported. + * mcon/U/Myread.U: Myread script now starts with a "startsh". - * mcon/U/Myread.U: Myread script now starts with a "startsh". Miscellaneous fixes. + * mcon/U/Oldconfig.U: Added support for src.U. New OSNAME define. - * mcon/U/Oldconfig.U: Added support for src.U. New OSNAME define. Can now sense new OSes. * mcon/U/Options.U: Optdef.sh now starts with a "startsh". Moved @@ -154,7 +154,7 @@ * mcon/U/d_csh.U: Added full_csh to preserve the full path even when portable. + * mcon/U/d_dosuid.U: Moved unit to TOP via a ?Y: layout directive. - * mcon/U/d_dosuid.U: Moved unit to TOP via a ?Y: layout directive. Tell them /dev/fd is not about floppy disks. * mcon/U/d_gconvert.U: Integrated new unit from perl5. @@ -170,7 +170,7 @@ * mcon/U/d_newsadm.U: Added Guess dependency. + * mcon/U/d_pidcheck.U: Replaced .o with $_o all over the place. - * mcon/U/d_pidcheck.U: Replaced .o with $_o all over the place. Added ?F: metalint hint. * mcon/U/d_poll.U: Mention that can be included if HAS_POLL @@ -182,7 +182,7 @@ * mcon/U/d_setpgid.U: Reworded symbol comments. * mcon/U/d_setpgrp.U: Obsoleted USE_BSDGRP in favor of + USE_BSD_SETPGRP. Another unit now also defines a USE_BSD_GETPGRP. - USE_BSD_SETPGRP. Another unit now also defines a USE_BSD_GETPGRP. Fallback for test program failure improved. * mcon/U/d_sgndchr.U, mcon/U/d_wifstat.U: Added a ?F: metalint hint. @@ -198,21 +198,21 @@ * mcon/U/i_varhdr.U: Varargs script now starts with leading "startsh". + * mcon/U/intsize.U: Avoid prompting the user if the test runs ok. - * mcon/U/intsize.U: Avoid prompting the user if the test runs ok. Moved code from longsize.U into there. New tests for shortsize as well. * mcon/U/libc.U: Replaced .a with $_a all over the place. Added support for HPUX-10 nm output. + * mcon/U/libnlist.U: Added usrinc and mips on the dependency line. - * mcon/U/libnlist.U: Added usrinc and mips on the dependency line. Make sure we call ./mips. Added a ?LINT: hint. * mcon/U/libpth.U: New loclibpth variable. * mcon/U/longsize.U: Code moved to intsize.U. + * mcon/U/mallocsrc.U: Added support for Free_t, the type of free(). - * mcon/U/mallocsrc.U: Added support for Free_t, the type of free(). Replaced .o with $_o all over the place. * mcon/U/manfmt.U, mcon/U/mansrc.U: Don't ask for AFS when they @@ -227,7 +227,7 @@ * mcon/U/nis.U: Ensure suitable defaults for hostcat and friends. + * mcon/U/orderlib.U: Replaced .a with $_a all over the place. - * mcon/U/orderlib.U: Replaced .a with $_a all over the place. Likewise for .o replaced by $_o. Now uses the ar located by Loc.U. * mcon/U/randbits.U: Added and to the C program @@ -262,13 +262,13 @@ * mcon/U/voidflags.U: Don't prompt them if the void support is high enough for us. + * mcon/configure: Added the srcdir support now that we have src.U. - * mcon/configure: Added the srcdir support now that we have src.U. Random cleanup for nicer help message. + * mcon/man/mconfig.SH: Documents the runnning environment and the - * mcon/man/mconfig.SH: Documents the running environment and the src.U unit. Added warnings for $_a and $_o, as well as "startsh". + * mcon/man/mlint.SH: New "create" and "empty" lint directives. - * mcon/man/mlint.SH: New "create" and "empty" lint directives. Documented new messages. * mcon/mxref.SH, mcon/man/mxref.SH: New -L option to match metaconfig @@ -341,7 +341,7 @@ * mcon/U/Config_h.U: Commented the purpose of the #un-def directive. + * mcon/U/Loc.U: Commented the purpose of the #un-def directive. - * mcon/U/Loc.U: Commented the purpose of the #un-def directive. Abort Configure run when mandatory command is missing. * mcon/U/Options.U: Protected option parsing code against 'echo -*' @@ -492,7 +492,7 @@ * mcon/U/libs.U, mcon/U/Loc.U, mcon/U/Guess.U, mcon/U/Oldconfig.U, mcon/U/libc.U: Now knows about OS/2 platforms. + * mcon/U/Head.U: Added SVR4-ish /opt directories to path list (ADO). - * mcon/U/Head.U: Added SVR4-ish /opt directories to path list (ADO). OS/2 platforms are using another path separator. * mcon/U/Typedef.U: Added backslash escapes within evals to prevent @@ -668,7 +668,7 @@ by checking both header and lib (ADO). * mcon/U/libc.U: Made sure only most recent version of shared lib is + picked. Final "nm -p" check now uses xscan and xrun like everybody. - picked. Final "nm -p" check now uses xscan and xrun like everybody. Can now grok linux nm output with lead __IO (ADO). Added support for linux ELF output, using 'W' for alias (ADO). @@ -693,7 +693,7 @@ Jmake was not working at all on HP-UX due to the way their cpp systematically removes trailing backslashes in text. The new fixcpp script is now a wrapper over cpp to first escape those + backslashes that should be preserved accross cpp before feeding - backslashes that should be preserved across cpp before feeding it with the text of the Jmakefile... Suppressed extra argument to NormalProgramTarget call in jmake rules. @@ -722,7 +722,7 @@ * jmake/fixcpp.SH, mcon/U/d_wifstat.U: Created. * jmake/jmake.SH: Now invokes cpp through new fixcpp script. First + pass now skips cpp comments alltogether. - pass now skips cpp comments altogether. * mcon/U/Head.U: Definition of paths wrongly added spurious ':' chars. @@ -990,7 +990,7 @@ * mcon/U/Config_sh.U: Moved path stripping from d_portable.U to end of Configure. + * mcon/U/Cppsym.U: New cc vs. cpp symbol checking suggested by JHI. - * mcon/U/Cppsym.U: New cc vs. cpp symbol checking suggested by JHI. Added more cpp symbols (JHI). * mcon/U/Getfile.U: Added support for escaping answers to skip @@ -1088,7 +1088,7 @@ Also, the leading comment in Chk_MANI.U now explains how this unit gets included into the Configure script. There used to be + an explaination there, but it was no longer accurate. - an explanation there, but it was no longer accurate. One new unit file (Begin.U). @@ -1312,7 +1312,7 @@ * mcon/U/Loc.U: Added ?F: line for metalint file checking. Be careful and guard against wildcard searching (ADO). + * mcon/U/Oldconfig.U: Added ?F: line for metalint file checking. - * mcon/U/Oldconfig.U: Added ?F: line for metalint file checking. Merged with the version used for perl5's Configure (ADO). * mcon/U/Options.U: Ensure option definition file is removed before @@ -1335,7 +1335,7 @@ mcon/U/d_dlerror.U, mcon/U/d_sysconf.U, mcon/U/i_dld.U, mcon/U/modetype.U: Created by ADO. + * mcon/U/cc.U: Detect gcc even when not called as 'gcc' (ADO). - * mcon/U/cc.U: Detect gcc even when not called as 'gcc' (ADO). Simplified gcc version checking (ADO). Added ?F: line for metalint file checking. @@ -1418,7 +1418,7 @@ * mcon/U/so.U: Now tells user how he can suppress shared lib lookup (ADO). Removed echo at the top, since it's now in the here-doc (ADO). + * mcon/U/ssizetype.U: Added ?F: line for metalint file checking. - * mcon/U/ssizetype.U: Added ?F: line for metalint file checking. Added 'ldflags' to the test compile line (ADO). * mcon/man/mconfig.SH: Added nroff protection for lines beginning @@ -1444,13 +1444,14 @@ * pat/pat.SH: Now unlinks all the files created by patlog in bugs. + * pat/pat.man: Documents new patlog script and the files it uses. - * pat/pat.man: Documents new patlog script and the files it uses. The RCS layer section has been extended slightly. * pat/patcil.SH: Now honors the VISUAL and EDITOR environment + variables. Newer RCS programs chop trailing spaces in log messages. - variables. Newer RCS programs chop trailing spaces in log messages. Separated V/E and v/e commands. New 'v' command to edit the file being patcil'ed. Added hook for 'V' command (not implemented yet). * pat/patmake.SH: A lot of setup is now performed by patlog. Added various escapes in strings for perl5 support. + diff -u dist-3.5-236/Configure dist-3.5-236/Configure --- dist-3.5-236/Configure +++ dist-3.5-236/Configure @@ -13,12 +13,12 @@ # # Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig. -# The dist package (which contains metaconfig) is available via SVN: -# svn co https://svn.code.sf.net/p/dist/code/trunk/dist +# The dist package (which contains metaconfig) is available via git: +# git clone git@github.com:rmanfredi/dist.git -# $Id: Head.U 167 2013-05-08 17:58:00Z rmanfredi $ +# $Id$ # -# Generated on Sat Nov 14 16:05:58 CET 2015 [metaconfig 3.5-197] +# Generated on Tue Jun 5 15:24:34 CEST 2018 [metaconfig 3.5-241] cat >c1$$ <&2 + -V) echo "$me generated by metaconfig 3.5-241." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -855,10 +856,14 @@ : Find the path to the source tree case "$src" in '') case "$0" in - */*) - src=`echo $0 | sed -e 's%/[^/][^/]*$%%'` - ;; - *) src='.';; + */*) src=`echo $0 | sed -e 's%/[^/][^/]*$%%'` + case "$src" in + /*) ;; + .) ;; + *) src=`cd ../$src && pwd` ;; + esac + ;; + *) src='.';; esac;; esac case "$src" in @@ -2270,12 +2275,15 @@ : who configured the system cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` -cf_by=`(logname) 2>/dev/null` case "$cf_by" in "") - cf_by=`(whoami) 2>/dev/null` + cf_by=`(logname) 2>/dev/null` case "$cf_by" in - "") cf_by=unknown ;; + "") + cf_by=`(whoami) 2>/dev/null` + case "$cf_by" in + "") cf_by=unknown ;; + esac ;; esac ;; esac @@ -2352,10 +2360,10 @@ $startsh : expand filename case "\$1" in - ~/*|~) + \~/*|\~) echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|" ;; - ~*) + \~*) if $test -f /bin/csh; then /bin/csh -f -c "glob \$1" failed=\$? @@ -2879,6 +2887,8 @@ '') _o='.o';; esac +rm_try="$rm -f try try$_exe a.out .out try.[cho] try.$_o core core.try* try.core*" + : set the base revision baserev=3.5 @@ -3941,7 +3951,7 @@ ;; n) echo "OK, that should do.";; esac -$rm -f try try.* core +$rm_try : determine default editor echo " " @@ -4250,9 +4260,9 @@ esac ;; *) dflt="$pager" - fn="f/($pager)" ;; esac +fn="f/($dflt)" echo " " rp='What pager is used on your system?' . ./getfile @@ -4572,6 +4582,7 @@ pthread='$pthread' revision='$revision' rm='$rm' +rm_try='$rm_try' rmail='$rmail' run='$run' scriptdir='$scriptdir' @@ -4616,6 +4627,12 @@ zip='$zip' EOT +: project-specific code +file=revision.h +echo " " +echo "Generating $file..." >&4 +bin/svn-revision . $file + : add special variables $test -f $src/patchlevel.h && \ awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh diff -u dist-3.5-236/MANIFEST dist-3.5-236/MANIFEST --- dist-3.5-236/MANIFEST +++ dist-3.5-236/MANIFEST @@ -8,6 +8,7 @@ Makefile.SH A makefile to run subsidiary makefiles README Basic instructions Wishlist Features I would like to add +U/Specific.U Specific code for dist before .SH extraction bin/ Some binary tools bin/Jmakefile Generic makefile description for bin bin/Makefile.SH Jmake-generated configured makefile @@ -127,6 +128,7 @@ mcon/U/Sendfile64.U Is sendfile() working with the largefile flags? mcon/U/Setvar.U Set a variable with some sanity checks mcon/U/Signal.U Utilities for sig_name.U +mcon/U/Specific.U Hook for project-specific code before .SH extraction mcon/U/Tr.U Builds a tr script to handle lower and upper classes mcon/U/Trylink.U Compiles and links a test program mcon/U/Typedef.U Defines a typedef lookup function @@ -170,6 +172,7 @@ mcon/U/d_bcmp.U Do we have bcmp() or memcmp()? mcon/U/d_bcopy.U Do we have bcopy() or memcpy()? mcon/U/d_bfd_lib.U Is the BFD library available? +mcon/U/d_bfd_section.U Do bfd_section_xxx() accessors exist with 1 argument? mcon/U/d_bindtxtcode.U Do we have bind_textdomain_codeset()? mcon/U/d_brokstat.U Check whether stat() macros are broken mcon/U/d_bsdjmp.U Do we have BSD _setjmp() and _longjmp()? @@ -221,7 +224,6 @@ mcon/U/d_epoll.U Can we use epoll_xxx() routines? mcon/U/d_etext_symbol.U Whether linker defines the "etext" symbol mcon/U/d_euc2jis.U Do we have euc2jis()? -mcon/U/d_fast_assert.U Can we use fast assertions? mcon/U/d_fchdir.U Do we have fchdir()? mcon/U/d_fchmod.U Do we have fchmod()? mcon/U/d_fchown.U Do we have fchown()? @@ -309,6 +311,7 @@ mcon/U/d_memcpy.U Do we have memcpy()? mcon/U/d_memmove.U Do we have memmove()? mcon/U/d_mempcpy.U Do we have mempcpy()? +mcon/U/d_memrchr.U Do we have memrchr()? mcon/U/d_memset.U Do we have memset()? mcon/U/d_mkdir.U Do we have mkdir()? mcon/U/d_mkfifo.U Do we have mkfifo()? @@ -755 +757,0 @@ -revision.h The current SVN revision number for dist diff -u dist-3.5-236/bin/manicheck.man dist-3.5-236/bin/manicheck.man --- dist-3.5-236/bin/manicheck.man +++ dist-3.5-236/bin/manicheck.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -12,7 +12,7 @@ .\" Revision 3.0 1993/08/18 12:04:02 ram .\" Baseline for dist 3.0 netwide release. .\" -.\" +.\" .TH MANICHECK 1 ram .SH NAME manicheck \- check manifest accuracy diff -u dist-3.5-236/bin/manilist.man dist-3.5-236/bin/manilist.man --- dist-3.5-236/bin/manilist.man +++ dist-3.5-236/bin/manilist.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -21,7 +21,7 @@ .\" Revision 3.0 1993/08/18 12:04:04 ram .\" Baseline for dist 3.0 netwide release. .\" -.\" +.\" .TH MANILIST 1 ram .SH NAME manilist \- report status of files in a source directory diff -u dist-3.5-236/bin/packinit.man dist-3.5-236/bin/packinit.man --- dist-3.5-236/bin/packinit.man +++ dist-3.5-236/bin/packinit.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -24,7 +24,7 @@ .\" Revision 3.0 1993/08/18 12:04:06 ram .\" Baseline for dist 3.0 netwide release. .\" -.\" +.\" .TH PACKINIT 1 ram .SH NAME packinit \- initialize or update your .package file diff -u dist-3.5-236/debian/changelog dist-3.5-236/debian/changelog --- dist-3.5-236/debian/changelog +++ dist-3.5-236/debian/changelog @@ -1,3 +1,12 @@ +dist (1:3.5-236-1) unstable; urgency=medium + + * New upstream git snapshot + * Ack NMUs + * Update VCS-* headers in control + * Move to standards version 4.3.0 (no changes were needed). + + -- Manoj Srivastava Tue, 19 May 2020 20:46:55 -0700 + dist (1:3.5-236-0.2) unstable; urgency=medium * Non-maintainer upload. reverted: --- dist-3.5-236/debian/compat +++ dist-3.5-236.orig/debian/compat @@ -1 +0,0 @@ -9 diff -u dist-3.5-236/debian/control dist-3.5-236/debian/control --- dist-3.5-236/debian/control +++ dist-3.5-236/debian/control @@ -1,12 +1,12 @@ Source: dist -VCS-Git: https://anonscm.debian.org/git/users/srivasta/debian/dist.git -VCS-Browser: http://anonscm.debian.org/git/users/srivasta/debian/dist.git +VCS-Git: https://salsa.debian.org/srivasta/dist.git +VCS-Browser: https://salsa.debian.org/srivasta/dist Section: devel Priority: optional Maintainer: Manoj Srivastava -Standards-Version: 4.1.3 -Build-Depends-Indep: debhelper (>= 11), sharutils, po-debconf, - gettext +Standards-Version: 4.3.0 +Build-Depends: debhelper-compat (=12) +Build-Depends-Indep: sharutils, po-debconf, gettext Package: dist Architecture: all diff -u dist-3.5-236/jmake/jmkmf.man dist-3.5-236/jmake/jmkmf.man --- dist-3.5-236/jmake/jmkmf.man +++ dist-3.5-236/jmake/jmkmf.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of diff -u dist-3.5-236/kit/kitpost.man dist-3.5-236/kit/kitpost.man --- dist-3.5-236/kit/kitpost.man +++ dist-3.5-236/kit/kitpost.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -31,7 +31,7 @@ ] [ .B -m .I dest1,dest2 -] [ +] [ .I kits ] [ .I newsgroups diff -u dist-3.5-236/kit/kitsend.man dist-3.5-236/kit/kitsend.man --- dist-3.5-236/kit/kitsend.man +++ dist-3.5-236/kit/kitsend.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of diff -u dist-3.5-236/kit/makeSH.man dist-3.5-236/kit/makeSH.man --- dist-3.5-236/kit/makeSH.man +++ dist-3.5-236/kit/makeSH.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -12,7 +12,7 @@ .\" Revision 3.0 1993/08/18 12:04:27 ram .\" Baseline for dist 3.0 netwide release. .\" -.\" +.\" .TH MAKESH 1 LOCAL .SH NAME makeSH \- a .SH script maker diff -u dist-3.5-236/kit/makedist.man dist-3.5-236/kit/makedist.man --- dist-3.5-236/kit/makedist.man +++ dist-3.5-236/kit/makedist.man @@ -2,7 +2,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -19,7 +19,7 @@ .\" Revision 3.0 1993/08/18 12:04:31 ram .\" Baseline for dist 3.0 netwide release. .\" -.\" +.\" .de Sh .br .ne 5 diff -u dist-3.5-236/kit/manifake.man dist-3.5-236/kit/manifake.man --- dist-3.5-236/kit/manifake.man +++ dist-3.5-236/kit/manifake.man @@ -1,7 +1,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of diff -u dist-3.5-236/mcon/U/Trylink.U dist-3.5-236/mcon/U/Trylink.U --- dist-3.5-236/mcon/U/Trylink.U +++ dist-3.5-236/mcon/U/Trylink.U @@ -74,7 +74,7 @@ "") echo "--- $var ---" >> "$file";; *) echo " "; $echo $n "Checking $msg...$c" >&4; - echo "--- $var --- ($msg)" >>"$file" + echo "--- $var --- ($msg)" >> "$file" ;; esac; $cat try.c >> "$file"; reverted: --- dist-3.5-236/mcon/U/nis.U +++ dist-3.5-236.orig/mcon/U/nis.U @@ -165,16 +165,4 @@ '') passcat=':' $test -f /etc/passwd && passcat='cat /etc/passwd';; esac -case "$hostcat" in -'') hostcat='cat /etc/hosts';; -*) ;; -esac -case "$groupcat" in -'') groupcat='cat /etc/group';; -*) ;; -esac -case "$passcat" in -'') passcat='cat /etc/passwd';; -*) ;; -esac diff -u dist-3.5-236/mcon/man/mconfig.SH dist-3.5-236/mcon/man/mconfig.SH --- dist-3.5-236/mcon/man/mconfig.SH +++ dist-3.5-236/mcon/man/mconfig.SH @@ -32,7 +32,7 @@ .\" .\" $Log: mconfig.SH,v $ .\" Revision 3.0.1.17 1997/02/28 16:29:31 ram -.\" patch61: documents the running environment and the src.U unit +.\" patch61: documents the runnning environment and the src.U unit .\" patch61: added warnings for $_a and $_o, as well as "startsh" .\" .\" Revision 3.0.1.16 1995/09/25 09:17:48 ram @@ -1742,6 +1742,25 @@ make use of ~name expanstion, then the above will be a no-op on the \fI$dflt\fR variable, naturally. .TP +Specific.U +This unit is empty by default. It is meant as a project-specific hook +to have shell code executed by \fIConfigure\fR after \fIconfig.sh\fR was +generated but before the extraction of .SH files. +.sp +Copy the unit to your project's \fIU/\fR directory and customize it. +.sp +Here is what the \fIdist\fR project uses it for (showing only the unit's code, +not the full unit here): +.Ex +: project-specific code +file=revision.h +echo " " +echo "Generating \$file..." >&4 +bin/svn-revision . \$file +.Ef +That shell code is executed when \fIConfigure\fR is back to the top directory +of the source tree. +.TP Typedef.U This unit produces the \fI\$typedef\fR shell variable, used internally by \fIConfigure\fR to check whether a typedef exists or not. A typical diff -u dist-3.5-236/mcon/man/mlint.SH dist-3.5-236/mcon/man/mlint.SH --- dist-3.5-236/mcon/man/mlint.SH +++ dist-3.5-236/mcon/man/mlint.SH @@ -23,7 +23,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -260,11 +260,20 @@ This does not appear when declaring both a private UU file and a public file with the same name, for instance. .TP -"(?F) UU file $uufile in non-special unit ignored." +"(?F) UU file 'xxx' in non-special unit ignored." Private UU files (i.e. files like the \fImyread\fR script created for later perusal by \fIConfigure\fR) may only be created in special units. Exceptions allowed if the ?F: line is preceded by a proper ?LINT: hint. .TP +"(?F) file 'xxx' already exported by yyy.U." +The listed file 'xxx' is already reported exported (listed likewise) in +the other unit yyy.U and is conflicting. An exported file is a generated +file above the UU directory. +.TP +"(?F) UU file 'xxx' already created by yyy.U." +The listed file 'xxx' is already created in the UU directory by the other +unit yyy.U. A created file is listed as ./xxx on the ?F: line. +.TP "(?T) temporary symbol '\$xxx' multiply declared." Self explanatory. .TP diff -u dist-3.5-236/mcon/man/mxref.SH dist-3.5-236/mcon/man/mxref.SH --- dist-3.5-236/mcon/man/mxref.SH +++ dist-3.5-236/mcon/man/mxref.SH @@ -23,7 +23,7 @@ .\" $Id$ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of reverted: --- dist-3.5-236/pat/patcil.SH +++ dist-3.5-236.orig/pat/patcil.SH @@ -61,8 +61,6 @@ !GROK!THIS! cat >>patcil <<'!NO!SUBS!' -use File::Temp qw/ tempfile tempdir /; - $progname = &profile; # Read ~/.dist_profile require 'getopts.pl'; &usage unless $#ARGV >= 0; @@ -506,12 +504,12 @@ sub edit { local($text) = join("\n", @_); + open(TMP,">/tmp/cil$$") || die "Can't create /tmp/cil$$"; + print TMP $text; + close TMP; + system $EDITOR, "/tmp/cil$$"; + $text = `cat /tmp/cil$$`; + unlink "/tmp/cil$$"; - my $tmp = File::Temp->new(); - print $tmp $text; - close $tmp; - system $EDITOR, "$tmp"; - $text = `cat "$tmp"`; - unlink "$tmp"; $text; } reverted: --- dist-3.5-236/pat/patdiff.SH +++ dist-3.5-236.orig/pat/patdiff.SH @@ -49,8 +49,6 @@ !GROK!THIS! cat >>patdiff <<'!NO!SUBS!' -use File::Temp qw/ tempfile tempdir /; - $RCSEXT = ',v' unless $RCSEXT; $TOPDIR = ''; # We are at top-level directory @@ -161,11 +159,9 @@ close DIFF; system 'rcs', "-Nlastpat:$new", @files; } else { + ©right'expand("co -p -rlastpat $file", "/tmp/pdo$$"); + ©right'expand("co -p -r$new $file", "/tmp/pdn$$"); + open(DIFF, "$mydiff /tmp/pdo$$ /tmp/pdn$$ |") || - my $tmpo = File::Temp->new(); - my $tmpn = File::Temp->new(); - ©right'expand("co -p -rlastpat $file", "$tmpo"); - ©right'expand("co -p -r$new $file", "$tmpn"); - open(DIFF, "$mydiff $tmpo $tmpn |") || die "Can't run $mydiff"; while () { # Contextual or unified diff if ($. == 1) { @@ -181,7 +177,7 @@ } close DIFF; system 'rcs', "-Nlastpat:$new", @files; + unlink "/tmp/pdn$$", "/tmp/pdo$$"; - unlink "$tmpo", "$tmpn"; } } else { if ($mydiff eq '') { @@ -195,11 +191,9 @@ } close DIFF; } else { + system "co -p -rlastpat $files >/tmp/pdo$$"; + system "cp $file /tmp/pdn$$"; + open(DIFF, "$mydiff /tmp/pdo$$ /tmp/pdn$$ |") || - my $tmpo = File::Temp->new(); - my $tmpn = File::Temp->new(); - system "co -p -rlastpat $files >$tmpo"; - system "cp $file $tmpn"; - open(DIFF, "$mydiff $tmpo $tmpn |") || die "$progname: can't fork $mydiff: $!\n"; while () { # Contextual or unified diff @@ -215,7 +209,7 @@ print PATCH; } close DIFF; + unlink "/tmp/pdn$$", "/tmp/pdo$$"; - unlink "$tmpo", "$tmpn"; } } } only in patch2: unchanged: --- dist-3.5-236.orig/.gitignore +++ dist-3.5-236/.gitignore @@ -1,7 +1,9 @@ .config/ +.package *.bak *.1 Makefile +Wanted bin/manicheck bin/manilist bin/packinit only in patch2: unchanged: --- dist-3.5-236.orig/README +++ dist-3.5-236/README @@ -1,10 +1,10 @@ dist 4.0 - ** Alpha version ** Copyright (c) 1988, Larry Wall Copyright (c) 1990-1992, Harlan Stenn Copyright (c) 1991-1997, Raphael Manfredi Copyright (c) 2004-2006, Raphael Manfredi + Copyright (c) 2007+ Many other contributors ------------------------------------------------------------------------ This program is free software; you can redistribute it and/or modify @@ -18,15 +18,7 @@ ------------------------------------------------------------------------ This version of dist requires you to have at least perl 4.0 PL36. -It has also been ported to work with perl 5.0 PL0, provided you have -at least integrated patches 0a-0h, issued by Andy Dougherty and made -available at the following ftp sites: - - ftp.demon.co.uk:/pub/perl/db/perl5.000-p0a-p0h.tar.gz - ftp.funet.fi:/pub/languages/perl/ports/perl5/perl5.000-p0a-p0h.tar.gz - -Please read all the directions below before you proceed any further, and -then follow them carefully. +It has also been ported to work with modern perl 5. After you have unpacked your kit, you should have all the files listed in MANIFEST. @@ -48,31 +40,6 @@ package) must be initialized by putting a .package file into it. This can be done by running packinit in that directory. -There is a mailing list hosted in Japan and set up by Shigeya Suzuki -, for discussion about the dist package as a -whole. It's a good place to ask questions (or answer them) and to -send your patches. I will post official patches to the net, as well -as to the dist-users list. - -To send a mail to the list, address it to . -To subscribe, send a mail to . If you don't -know how to use majordomo, the syntax of the subscribe command is: - - subscribe dist-users [address] - -where the address part is optional. You may unsubscribe automatically -at any time by sending: - - unsubscribe dist-users - -If you have a problem with this version of dist, it is recommended that -you subscribe to the list, then send a description of your problem to it. -If you send mail to me personally, I may not be able to answer in a -timely fashion. - -This mailing list has low traffic (a few articles per week, typically), -and it is expected to remain so, with a high signal/noise ratio. - Notes: If you are running on a system with <= 14 char filenames, don't @@ -119,20 +86,10 @@ carrying useless files. You should keep this distribution intact, so that future patches will be applyable. -7) I have an automatic patch sender. Send me the following mail: - - Subject: Command - @SH mailhelp PATH - -and you'll get instructions (PATH stands for YOUR e-mail address, either -in INTERNET or in bang notation). I would recommend you to get all the -issued patches before you start making some modifications on this -package. - -8) If you wish to deinstall the package, you may run "make deinstall". +7) If you wish to deinstall the package, you may run "make deinstall". A separate "make deinstall.man" will remove the manual pages. Be sure the makefiles are correctly set before running any deinstall target. On USG systems, some executable have a chance to remain despite the deinstall (text file busy...). - Raphael Manfredi + Raphael Manfredi only in patch2: unchanged: --- dist-3.5-236.orig/U/Specific.U +++ dist-3.5-236/U/Specific.U @@ -0,0 +1,33 @@ +?RCS: +?RCS: Copyright (c) 2018, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic License, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic License; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?X: +?X: This unit is intended to be a project-specific hook. +?X: By default, it is therefore empty, meant to be copied to your private +?X: unit directory (U) and seasoned to taste. +?X: +?X: If you need specific code generation to happen once the configuration +?X: is finished and config.sh was generated, but before the extraction of +?X: the .SH files begins, then this is the place to put these special +?X: code that the .SH files will require to run properly. +?X: +?X: When this unit triggers, Configure is back to the top directory. +?X: +?MAKE:Specific: Config_sh +?MAKE: -pick add $@ %< +?T:file +?X: +?X: Keep the above ?MAKE: lines and then append your specific code here. +?X: +: project-specific code +file=revision.h +echo " " +echo "Generating $file..." >&4 +bin/svn-revision . $file + only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Assert.U +++ dist-3.5-236/mcon/U/Assert.U @@ -20,7 +20,6 @@ ?X: There is no need to link the file to spot the assertion failure. ?X: $cat >static_assert.h <<'EOC' -#define STATIC_ASSERT(expr) \ - do { switch (0) { case ((expr) ? 1 : 0): case 0: break; } } while(0) +#define STATIC_ASSERT(expr) ((void) sizeof(char[1 - 2*!(expr)])) EOC only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Checkcc.U +++ dist-3.5-236/mcon/U/Checkcc.U @@ -37,10 +37,10 @@ ?INIT:ccname='' ?INIT:ccversion='' : generate the trygcc script for later perusal -cat <trygcc +$cat <trygcc $startsh EOS -cat <<'EOSC' >>trygcc +$cat <<'EOSC' >>trygcc case "$cc" in '') ;; *) $rm -f try try.* @@ -100,10 +100,10 @@ EOSC : generate the checkcc script for later perusal -cat <checkcc +$cat <checkcc $startsh EOS -cat <<'EOSC' >>checkcc +$cat <<'EOSC' >>checkcc case "$cc" in '') ;; *) $rm -f try try.* only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Config_sh.U +++ dist-3.5-236/mcon/U/Config_sh.U @@ -32,7 +32,7 @@ ?MAKE: -pick add.Config_sh $@ %< ?MAKE: -pick add $@ ./Obsol_sh ?MAKE: -pick close.Config_sh $@ %< -?F:!config.over !config.arch +?F:!config.over !config.arch config.sh ?T:file sfile xsed ?LINT:unclosed EOT : back to where it started only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Finish.U +++ dist-3.5-236/mcon/U/Finish.U @@ -35,7 +35,7 @@ ?X: SH files, which among other things produce config.h and (usually) Makefile. ?X: It offers to do a make depend if the Makefile contains that target. ?X: -?MAKE:Finish: Chk_MANI Extract Myread Oldsym Magic_h cat rm contains \ +?MAKE:Finish: Chk_MANI Extract Specific Myread Oldsym Magic_h cat rm contains \ test package make ?MAKE: -pick add $@ %< ?F:!config.sh @@ -138,4 +138,3 @@ $rm -rf UU : End of Configure - only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Getfile.U +++ dist-3.5-236/mcon/U/Getfile.U @@ -48,7 +48,7 @@ ?X: those are prefixes for the filename. Unless $gfpthkeep is set to 'y', ?X: gfpth is cleared on return from Getfile. ?X: -?X: If is is followed by a ~, then ~name substitution will occur. Upon return, +?X: If it is followed by a ~, then ~name substitution will occur. Upon return, ?X: $ans is set with the filename value. If a / is specified, then only a full ?X: path name is accepted (but ~ substitution occurs before, if needed). The ?X: expanded path name is returned in that case. only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Head.U +++ dist-3.5-236/mcon/U/Head.U @@ -77,8 +77,8 @@ ?X: # Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig. -# The dist package (which contains metaconfig) is available via SVN: -# svn co https://svn.code.sf.net/p/dist/code/trunk/dist +# The dist package (which contains metaconfig) is available via git: +# git clone git@github.com:rmanfredi/dist.git ?X: ?X: NOTA BENE: ?X: If you develop you own version of metaconfig based on this work, only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Obsol_h.U +++ dist-3.5-236/mcon/U/Obsol_h.U @@ -20,7 +20,7 @@ ?MAKE: -pick prepend $@ ./Obsol_h ?LINT:nocomment /* - * The following symbols are obsolete. They are mapped to the the new + * The following symbols are obsolete. They are mapped to the new * symbols only to ease the transition process. The sources should be * updated so as to use the new symbols only, as the support for these * obsolete symbols may end without notice. only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Obsol_sh.U +++ dist-3.5-236/mcon/U/Obsol_sh.U @@ -20,7 +20,7 @@ ?MAKE: -pick prepend $@ ./Obsol_sh ?LINT:nocomment # -# The following symbols are obsolete. They are mapped to the the new +# The following symbols are obsolete. They are mapped to the new # symbols only to ease the transition process. The sources should be # updated so as to use the new symbols only, since supporting of those # obsolete symbols may end without notice. only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/Specific.U +++ dist-3.5-236/mcon/U/Specific.U @@ -0,0 +1,26 @@ +?RCS: +?RCS: Copyright (c) 2018, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic License, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic License; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?X: +?X: This unit is intended to be a project-specific hook. +?X: By default, it is therefore empty, meant to be copied to your private +?X: unit directory (U) and seasoned to taste. +?X: +?X: If you need specific code generation to happen once the configuration +?X: is finished and config.sh was generated, but before the extraction of +?X: the .SH files begins, then this is the place to put these special +?X: code that the .SH files will require to run properly. +?X: +?X: When this unit triggers, Configure is back to the top directory. +?X: +?MAKE:Specific: Config_sh +?MAKE: -pick add $@ %< +?X: +?X: Keep the above ?MAKE: lines and then append your specific code here. +?X: only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/ccflags.U +++ dist-3.5-236/mcon/U/ccflags.U @@ -174,11 +174,11 @@ case "$hint" in default|recommended) case "$gccversion" in - 1*) dflt='-fpcc-struct-return' ;; + 1) dflt='-fpcc-struct-return' ;; esac ?X: check for POSIXized ISC case "$gccversion" in - 2*) if test -d /etc/conf/kconfig.d && + 2) if test -d /etc/conf/kconfig.d && $contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1 then dflt="$dflt -posix" @@ -187,7 +187,7 @@ esac ?X: turn warnings on if they're using gcc case "$gccversion" in - 1*|2*) dflt="$dflt -Wall";; + 1|2) dflt="$dflt -Wall";; ?X: starting with version 3, add "-W -Wall -Wformat=2 -Wshadow" by default *) dflt="$dflt -W -Wall -Wformat=2 -Wshadow";; esac @@ -265,7 +265,7 @@ : the following weeds options from ccflags that are of no interest to cpp cppflags="$ccflags" case "$gccversion" in -1*) cppflags="$cppflags -D__GNUC__" +1) cppflags="$cppflags -D__GNUC__" esac case "$mips_type" in '');; only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/d_bfd_section.U +++ dist-3.5-236/mcon/U/d_bfd_section.U @@ -0,0 +1,49 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 2020, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic License, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic License; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:d_bfd_section: Trylink cat d_bfd_lib +?MAKE: -pick add $@ %< +?S:d_bfd_section: +?S: This variable conditionally defines the HAS_BFD_SECTION_1ARG symbol, +?S: which indicates to the C program that the bfd_section_xxx() accessors +?S: from the BFD library exists and taks only one argument. +?S:. +?C:HAS_BFD_SECTION_1ARG: +?C: This symbol, if defined, indicates that the bfd_section_xxx() accessors +?C: from the BFD library takes only one argument, which is the new behaviour +?C: starting from BFD 2.34. +?C:. +?H:#$d_bfd_section HAS_BFD_SECTION_1ARG /**/ +?H:. +: see whether bfd_section_vma exists and takes 1 argument +case "$d_bfd_lib" in +$undef) + d_bfd_section=$undef + ;; +*) + $cat >try.c < +int main(void) +{ + bfd *b = 0; + asection *sec = 0; + + return 0 == bfd_section_vma(sec); +} +EOC + cyn="whether bfd_section_vma() takes 1 argument" + set d_bfd_section + eval $trylink + ;; +esac + only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/d_memrchr.U +++ dist-3.5-236/mcon/U/d_memrchr.U @@ -0,0 +1,40 @@ +?RCS: +?RCS: Copyright (c) 2018 Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic License, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic License; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:d_memrchr: Trylink cat +?MAKE: -pick add $@ %< +?S:d_memrchr: +?S: This variable conditionally defines the HAS_MEMRCHR symbol, which +?S: indicates to the C program that the memrchr() routine is available +?S: to scan a block of memory backwards for a character. +?S:. +?C:HAS_MEMRCHR: +?C: This symbol, if defined, indicates that the memrchr routine is available +?C: to scan a block of memory backwards for a character. +?C: If undefined, roll your own. +?C:. +?H:#$d_memrchr HAS_MEMRCHR /**/ +?H:. +?LINT:set d_memrchr +: see if memrchr exists +$cat >try.c < +int main(void) +{ + static char s[] = "xxx"; + static size_t n = sizeof(s); + void *p; + p = memrchr(s, 'x', n); + return p ? 0 : 1; +} +EOC +cyn=memrchr +set d_memrchr +eval $trylink + only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/d_tminsys.U +++ dist-3.5-236/mcon/U/d_tminsys.U @@ -20,7 +20,7 @@ ?S:. ?C:TM_IN_SYS (TMINSYS): ?C: This symbol is defined if this system declares "struct tm" in -?C: in rather than . We can't just say +?C: rather than . We can't just say ?C: -I/usr/include/sys because some systems have both time files, and ?C: the -I trick gets the wrong one. ?C:. only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/gccvers.U +++ dist-3.5-236/mcon/U/gccvers.U @@ -17,6 +17,9 @@ ?S: If GNU cc (gcc) is used, this variable holds '1' or '3' (for instance) ?S: to indicate whether the compiler is version 1 or 3. This is used in ?S: setting some of the default cflags. It is set to '' if not gcc. +?S: Note that it only contains the major version number, and, when using +?S: case statements to do different things depending on the major, do not +?S: use statements like "1*)" because it will match version 1, 10, 11, etc. ?S:. ?S:gccosandvers: ?S: If GNU cc (gcc) is used, this variable the operating system and @@ -58,7 +61,7 @@ fi $rm -f try try.* case "$gccversion" in -1*) cpp=`./loc gcc-cpp $cpp $pth` ;; +1) cpp=`./loc gcc-cpp $cpp $pth` ;; esac case "$gccversion" in '') gccosandvers='' ;; @@ -99,7 +102,7 @@ : gcc 3.1 complains about adding -Idirectories that it already knows about, : so we will take those off from locincpth. case "$gccversion" in -3*) +3) echo "main(){}">try.c for incdir in `$cc -v -c try.c 2>&1 | \ sed '1,/^#include <\.\.\.>/d;/^End of search list/,$d;s/^ //'` ; do only in patch2: unchanged: --- dist-3.5-236.orig/mcon/U/voidflags.U +++ dist-3.5-236/mcon/U/voidflags.U @@ -111,6 +111,8 @@ hue = buf; if (doit()) iptr = hue; +?X: Avoid "variable set but not used" compilation warning + (void) iptr; #endif doit(); } only in patch2: unchanged: --- dist-3.5-236.orig/mcon/mconfig.SH +++ dist-3.5-236/mcon/mconfig.SH @@ -93,6 +93,8 @@ unlink 'Obsolete' unless $opt_w; # Obsolete file rebuilt if no -w &readpackage; # Merely get the package's name &init; # Various initializations +my %excluded_symbol; +read_exclusions($opt_X); # Load -X or .package equivalent `mkdir .MT 2>&1` unless -d '.MT'; # For private temporary files &locate_units; # Fill in @ARGV with a unit list only in patch2: unchanged: --- dist-3.5-236.orig/mcon/mxref.SH +++ dist-3.5-236/mcon/mxref.SH @@ -81,7 +81,10 @@ $NEWMANI = $opt_f || (-f 'MANIFEST.new' ? 'MANIFEST.new' : 'MANIFEST'); +&readpackage; # Merely get the package's name &init; # Various initializations +my %excluded_symbol; +read_exclusions($opt_X); # Load -X or .package equivalent `mkdir .MT 2>&1` unless -d '.MT'; # For private temporary files unlink 'Obsolete'; # Obsolete file rebuilt only in patch2: unchanged: --- dist-3.5-236.orig/mcon/pl/lint.pl +++ dist-3.5-236/mcon/pl/lint.pl @@ -78,6 +78,7 @@ %filetmp = (); # Local temporary files in ?F: directives %filesetin = (); # Lists units defining a temporary file %filecreated = (); # Records files created in this unit + %filedefined = (); # Records units that export a given file %prodfile = (); # Unit where a given file is said to be created %defseen = (); # Symbol defintions claimed %lintset = (); # Symbols declared set by a ?LINT: line @@ -622,15 +623,30 @@ } $prodfile{$file} .= "$unit " if $fileseen{$file} == 1; ($uufile = $file) =~ s|^\./(\S+)$|$1|; - next if $file eq $uufile; # Don't care about non-UU files + if ($file eq $uufile) { + # This is a non-UU files created and not a temporary file + # It is meant to be exported by Configure + if (exists $filedefined{$file}) { + my $other = $filedefined{$file}; + warn "$where: file '$file' already exported by $other.U.\n"; + } else { + $filedefined{$file} = $unit; + } + next; + } unless ($is_special || $lintcreated{$uufile}) { warn "$where: UU file '$uufile' in non-special unit ignored.\n"; delete $lintcreated{$uufile}; # Detect spurious LINT next; } delete $lintcreated{$uufile} if !$is_special; # Detect spurious LINT - $filemaster{$uufile} = $unit unless defined $filemaster{$uufile}; - $filecreated{$uufile} = 'a'; # Will be automagically incremented + if (exists $filemaster{$uufile}) { + my $other = $filemaster{$uufile}; + warn "$where: UU file '$uufile' already created by $other.U.\n"; + } else { + $filemaster{$uufile} = $unit; + $filecreated{$uufile} = 'a'; # Will be automagically incremented + } } } @@ -1308,6 +1324,7 @@ undef %shspecial; undef %shvisible; undef %filemaster; + undef %filedefined; # Spot multiply defined C symbols foreach $sym (keys %cmaster) { only in patch2: unchanged: --- dist-3.5-236.orig/pat/patlog.SH +++ dist-3.5-236/pat/patlog.SH @@ -252,7 +252,7 @@ exit 0; # All done. -# Returns true if .clog and .rlog (it it exists) are newer than .xlog. +# Returns true if .clog and .rlog (if it exists) are newer than .xlog. sub newertmp { return 1 unless -f ".xlog$bnum"; # To force regeneration return 1 if &newer(".clog$bnum", ".xlog$bnum") ||