From d7a2632b38736a3e49b7334d2dc40e07d4a66813 Mon Sep 17 00:00:00 2001 From: "H.Merijn Brand" Date: Tue, 8 Jan 2008 15:54:23 +0000 Subject: [PATCH] Part 1 of a big cleanup action based on the upcoming dist-4.0 p4raw-id: //depot/metaconfig@32898 --- U/a_dvisory/multiarch.U | 1 + U/a_dvisory/quadtype.U | 2 +- U/compline/Csym.U | 1 - U/compline/d_NOFILE.U | 2 +- U/compline/d_gnulibc.U | 3 ++- U/compline/d_sigaction.U | 2 +- U/compline/d_stdstdio.U | 2 +- U/compline/ptrsize.U | 2 -- U/ebcdic/ebcdic.U | 1 + U/ebcdic/trnl.U | 2 +- U/installdirs/localarch.U | 3 ++- U/installdirs/locallib.U | 2 +- U/installdirs/man1dir.U | 2 +- U/installdirs/scriptdir.U | 2 +- U/installdirs/siteprefix.U | 1 + U/installdirs/sitescript.U | 2 +- U/installdirs/vendorarch.U | 1 + U/installdirs/vendorbin.U | 3 ++- U/installdirs/vendorhtml1.U | 1 + U/installdirs/vendorhtml1dir.U | 1 + U/installdirs/vendorhtml3.U | 1 + U/installdirs/vendorhtml3dir.U | 1 + U/installdirs/vendorlib.U | 1 + U/installdirs/vendorman1.U | 1 + U/installdirs/vendorman1dir.U | 1 + U/installdirs/vendorman3.U | 1 + U/installdirs/vendorman3dir.U | 1 + U/installdirs/vendorprefix.U | 1 + U/installdirs/vendorscript.U | 3 ++- U/perl/Checkcc.U | 1 + U/perl/Cross.U | 3 +-- U/perl/Devel.U | 1 + U/perl/Extensions.U | 1 + U/perl/Extras.U | 1 + U/perl/Loc_ar.U | 1 - U/perl/ansi2knr.U | 2 +- U/perl/bincompat3.U | 2 -- U/perl/bincompat5005.U | 2 -- U/perl/d_c99_variadic.U | 1 - U/perl/d_futimes.U | 3 +-- U/perl/d_libm_lib_version.U | 3 +-- U/perl/d_modfl.U | 3 --- U/perl/d_printfed.U | 2 +- U/perl/d_procselfexe.U | 2 +- U/perl/d_snprintf.U | 2 +- 45 files changed, 42 insertions(+), 35 deletions(-) diff --git a/U/a_dvisory/multiarch.U b/U/a_dvisory/multiarch.U index a55cc63..54feae4 100644 --- a/U/a_dvisory/multiarch.U +++ b/U/a_dvisory/multiarch.U @@ -25,6 +25,7 @@ ?C:. ?H:#$multiarch MULTIARCH /**/ ?H:. +: Check if is a multiplatform env case "$osname" in next|rhapsody|darwin) multiarch="$define" ;; esac diff --git a/U/a_dvisory/quadtype.U b/U/a_dvisory/quadtype.U index 660c17b..80d4699 100644 --- a/U/a_dvisory/quadtype.U +++ b/U/a_dvisory/quadtype.U @@ -44,7 +44,7 @@ ?H:. ?LINT:set quadtype ?LINT:set uquadtype - +: Check if 64bit ints have a quad type echo " " echo "Checking which 64-bit integer type we could use..." >&4 ?X: We prefer quad types in order of int, long, long long, int64_t. diff --git a/U/compline/Csym.U b/U/compline/Csym.U index a757a23..eb57cb8 100644 --- a/U/compline/Csym.U +++ b/U/compline/Csym.U @@ -32,7 +32,6 @@ ?LINT:define csym ?LINT:use libc ?LINT:extern mistrustnm -?LINT:change mistrustnm ?LINT:set mistrustnm ?S:csym: ?S: This shell variable is used internally by Configure to check diff --git a/U/compline/d_NOFILE.U b/U/compline/d_NOFILE.U index 115b4e7..6377f63 100644 --- a/U/compline/d_NOFILE.U +++ b/U/compline/d_NOFILE.U @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:05:39 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:nofile d_gettblsz tablesize: Compile Myread Guess libc cat \ +?MAKE:nofile d_gettblsz tablesize: Compile Myread Guess cat \ test rm Csym +cc +ccflags +optimize +ldflags +libs ?MAKE: -pick add $@ %< ?S:nofile: diff --git a/U/compline/d_gnulibc.U b/U/compline/d_gnulibc.U index 1182751..3a42204 100644 --- a/U/compline/d_gnulibc.U +++ b/U/compline/d_gnulibc.U @@ -35,7 +35,7 @@ ?H:?%<:#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE) ?H:?%<:# define _GNU_SOURCE ?H:?%<:#endif -?H. +?H:. ?LINT: set d_gnulibc ?X: gnulibc can be executed by calling __libc_main(). ?X: Ulrich Drepper doesn't think any other libc does that, @@ -55,6 +55,7 @@ ?X: Although the exact format isn't documented, __gnu_get_libc_version() ?X: returns a simple string '2.1.3' in glibc 2.1.3. ?X: +: Check if we are using the GNU C library echo " " echo "Checking for GNU C Library..." >&4 cat >try.c <<'EOCP' diff --git a/U/compline/d_sigaction.U b/U/compline/d_sigaction.U index 8e895c9..3231b04 100644 --- a/U/compline/d_sigaction.U +++ b/U/compline/d_sigaction.U @@ -27,8 +27,8 @@ ?H:. ?T:val ?LINT:set d_sigaction -echo " " : see if we have sigaction +echo " " if set sigaction val -f d_sigaction; eval $csym; $val; then echo 'sigaction() found.' >&4 ?X: diff --git a/U/compline/d_stdstdio.U b/U/compline/d_stdstdio.U index 6d88999..19833fa 100644 --- a/U/compline/d_stdstdio.U +++ b/U/compline/d_stdstdio.U @@ -166,7 +166,7 @@ ?H:?d_stdiobase:#endif ?H:. ?W:d_stdiobase:FILE_base FILE_bufsiz -?LINT:set d_stdstdio d_stdiobase d_stdio_ptr_lval d_stdio_cnt_lval +?LINT:set d_stdstdio d_stdiobase ?T:ptr_lval cnt_lval filbuf xxx : see if _ptr and _cnt from stdio act std echo " " diff --git a/U/compline/ptrsize.U b/U/compline/ptrsize.U index ac4ce94..f48eac8 100644 --- a/U/compline/ptrsize.U +++ b/U/compline/ptrsize.U @@ -29,9 +29,7 @@ ?C:. ?H:#define PTRSIZE $ptrsize /**/ ?H:. -?LINT:change use64bitall ?LINT:extern use64bitint -?LINT:change use64bitint : check for length of pointer echo " " case "$ptrsize" in diff --git a/U/ebcdic/ebcdic.U b/U/ebcdic/ebcdic.U index b9ea614..5d72716 100644 --- a/U/ebcdic/ebcdic.U +++ b/U/ebcdic/ebcdic.U @@ -23,6 +23,7 @@ ?H:#$ebcdic EBCDIC /**/ ?H:. ?LINT:set ebcdic +: Determine if this is an EBCDIC system echo " " echo "Determining whether or not we are on an EBCDIC system..." >&4 $cat >try.c <<'EOM' diff --git a/U/ebcdic/trnl.U b/U/ebcdic/trnl.U index 59aec56..cf91acd 100644 --- a/U/ebcdic/trnl.U +++ b/U/ebcdic/trnl.U @@ -17,8 +17,8 @@ ?S: newline is not necessarily '\012'. ?S:. ?T: DJGPP -echo " " : Find the appropriate value for a newline for tr +echo " " ?X: dos djgpp uses '\015\012', but reportedly is happy with '\012' in the ?X: tr command. I don't know why it passes the '\n' test but later ?X: refuses to work correctly with it. --AD 6/14/98 diff --git a/U/installdirs/localarch.U b/U/installdirs/localarch.U index 51c3877..815db3f 100644 --- a/U/installdirs/localarch.U +++ b/U/installdirs/localarch.U @@ -10,7 +10,7 @@ ?RCS: ?RCS: ?MAKE:localarch localarchexp installlocalarch installlocalarchexp: \ - afs cat sed Getfile \ + afs cat Getfile \ Oldconfig Prefixit test archname uselocallib locallib sitearch ?MAKE: -pick add $@ %< ?Y:TOP @@ -60,6 +60,7 @@ ?H:. ?T:tdflt ?LINT:extern sitearch +: Set the localarch variables case "$uselocallib" in "$define") case "$sitearch" in diff --git a/U/installdirs/locallib.U b/U/installdirs/locallib.U index e9eb27c..f38e493 100644 --- a/U/installdirs/locallib.U +++ b/U/installdirs/locallib.U @@ -10,7 +10,7 @@ ?RCS: ?RCS: ?MAKE:uselocallib locallib locallibexp installlocallib installlocallibexp: \ - cat Getfile Oldconfig Prefixit test sed afs sitelib + cat Getfile Oldconfig Prefixit test afs sitelib ?MAKE: -pick add $@ %< ?Y:TOP ?S:uselocallib: diff --git a/U/installdirs/man1dir.U b/U/installdirs/man1dir.U index 5875919..c924d61 100644 --- a/U/installdirs/man1dir.U +++ b/U/installdirs/man1dir.U @@ -27,7 +27,7 @@ ?X: ?MAKE:man1dir man1direxp man1ext installman1dir: cat nroff Loc Oldconfig \ spackage test Getfile Setprefixvar Prefixit Prefixup sysman Myread \ - sed prefixexp + prefixexp ?MAKE: -pick add $@ %< ?LINT:change prefixvar ?Y:TOP diff --git a/U/installdirs/scriptdir.U b/U/installdirs/scriptdir.U index a584938..59632eb 100644 --- a/U/installdirs/scriptdir.U +++ b/U/installdirs/scriptdir.U @@ -25,7 +25,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:scriptdir scriptdirexp installscript: cat test Getfile Loc \ - Oldconfig +bin sed Prefixit Setprefixvar prefixexp Prefixup + Oldconfig +bin Prefixit Setprefixvar prefixexp Prefixup ?MAKE: -pick add $@ %< ?LINT:change prefixvar ?Y:TOP diff --git a/U/installdirs/siteprefix.U b/U/installdirs/siteprefix.U index 2d89002..c786b98 100644 --- a/U/installdirs/siteprefix.U +++ b/U/installdirs/siteprefix.U @@ -27,6 +27,7 @@ ?S: This variable is set non-null if the siteprefix was previously defined ?S: and gets set to a new value. Used internally by Configure only. ?S:. +: Set the siteprefix variables $cat <trygcc $startsh EOS diff --git a/U/perl/Cross.U b/U/perl/Cross.U index 9edd15f..6deeb6a 100644 --- a/U/perl/Cross.U +++ b/U/perl/Cross.U @@ -42,7 +42,6 @@ ?C: This symbol, if defined, indicates the target architecture ?C: Perl has been cross-compiled to. Undefined if not a cross-compile. ?C:. -?H: ?H:?%<:#ifndef USE_CROSS_COMPILE ?H:?%<:#$usecrosscompile USE_CROSS_COMPILE /**/ ?H:?%<:#define PERL_TARGETARCH "$targetarch" /**/ @@ -77,7 +76,7 @@ ?LINT:extern loclibpth ?LINT:change locincpth ?LINT:change loclibpth - +: Check for Cross-Compilation case "$usecrosscompile" in $define|true|[yY]*) $echo "Cross-compiling..." diff --git a/U/perl/Devel.U b/U/perl/Devel.U index f80e957..0742703 100644 --- a/U/perl/Devel.U +++ b/U/perl/Devel.U @@ -18,6 +18,7 @@ ?LINT:change usedevel ?LINT:change versiononly ?LINT:change installusrbinperl +: See if we are using a devel version and want that xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h` case "$usedevel" in $define|true|[yY]*) ;; diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U index 151478a..b8617ff 100644 --- a/U/perl/Extensions.U +++ b/U/perl/Extensions.U @@ -59,6 +59,7 @@ ?LINT:extern noextensions ?LINT:extern onlyextensions ?T:keepextensions i +: Check extensions echo " " echo "Looking for extensions..." >&4 : If we are using the old config.sh, known_extensions may contain diff --git a/U/perl/Extras.U b/U/perl/Extras.U index d8e5909..ab55234 100644 --- a/U/perl/Extras.U +++ b/U/perl/Extras.U @@ -11,6 +11,7 @@ ?S:extras: ?S: This variable holds a list of extra modules to install. ?S:. +: See if we want extra modules installed echo " " case "$extras" in '') dflt='n';; diff --git a/U/perl/Loc_ar.U b/U/perl/Loc_ar.U index 48bc1c1..9fa3d9a 100644 --- a/U/perl/Loc_ar.U +++ b/U/perl/Loc_ar.U @@ -15,7 +15,6 @@ ?S: not the user has specified 'portability'. This is only used ?S: in the Makefile.SH. ?S:. -?LINT:use ar : Store the full pathname to the ar program for use in the C program : Respect a hint or command line value for full_ar. case "$full_ar" in diff --git a/U/perl/ansi2knr.U b/U/perl/ansi2knr.U index 22c3a3c..e8476f0 100644 --- a/U/perl/ansi2knr.U +++ b/U/perl/ansi2knr.U @@ -12,7 +12,7 @@ ?S: Currently, this is not supported, so we just abort. ?S:. ?Y:TOP -?LINT:set ansi2knr +: Check if ansi2knr is required case "$prototype" in "$define") ;; *) ansi2knr='ansi2knr' diff --git a/U/perl/bincompat3.U b/U/perl/bincompat3.U index f7fa5d8..3f6c52a 100644 --- a/U/perl/bincompat3.U +++ b/U/perl/bincompat3.U @@ -24,8 +24,6 @@ ?C:. ?H:#$d_bincompat3 BINCOMPAT3 /**/ ?H:. -?LINT: set d_bincompat3 - : Binary compatibility with 5.003 is not possible with 5.004_50 and later. if test $patchlevel -gt 4 -o $subversion -ge 50; then d_bincompat3=$undef diff --git a/U/perl/bincompat5005.U b/U/perl/bincompat5005.U index 8b60217..ce17a03 100644 --- a/U/perl/bincompat5005.U +++ b/U/perl/bincompat5005.U @@ -26,8 +26,6 @@ ?C:. ?H:#$d_bincompat5005 PERL_BINCOMPAT_5005 /**/ ?H:. -?LINT: set d_bincompat5005 - : Binary compatibility with 5.005 is not possible for builds : with advanced features case "$usethreads$usemultiplicity" in diff --git a/U/perl/d_c99_variadic.U b/U/perl/d_c99_variadic.U index c5fff17..c642462 100644 --- a/U/perl/d_c99_variadic.U +++ b/U/perl/d_c99_variadic.U @@ -18,7 +18,6 @@ ?C:. ?H:#$d_c99_variadic_macros HAS_C99_VARIADIC_MACROS /**/ ?H:. -?LINT:set d_c99_variadic_macros : see if the Compiler supports C99 variadic macros case "$i_stdarg$i_stdlib" in "$define$define") diff --git a/U/perl/d_futimes.U b/U/perl/d_futimes.U index 413fcd2..3ed3a95 100644 --- a/U/perl/d_futimes.U +++ b/U/perl/d_futimes.U @@ -17,10 +17,9 @@ ?C:. ?H:#$d_futimes HAS_FUTIMES /**/ ?H:. -?LINT:set d_futimes ?T:rc -d_futimes="$undef" : check for a working futimes +d_futimes="$undef" echo " " echo "Checking if you have a working futimes()" >&4 $cat >try.c <&4 $cat >try.c <try.c <<'EOSC' diff --git a/U/perl/d_procselfexe.U b/U/perl/d_procselfexe.U index 44306e9..d5de2f9 100644 --- a/U/perl/d_procselfexe.U +++ b/U/perl/d_procselfexe.U @@ -25,7 +25,7 @@ ?H:?%<:#endif ?H:. ?LINT: set d_procselfexe -?LINT: set procselfexe +: Check if exe is symlink to abs path of executing program echo " " procselfexe='' val="$undef" diff --git a/U/perl/d_snprintf.U b/U/perl/d_snprintf.U index e2f3be2..c9d68bf 100644 --- a/U/perl/d_snprintf.U +++ b/U/perl/d_snprintf.U @@ -29,7 +29,7 @@ ?H:#$d_snprintf HAS_SNPRINTF /**/ ?H:#$d_vsnprintf HAS_VSNPRINTF /**/ ?H:. -?LINT:set d_snprintf d_vsnprintf +?F:try : see if snprintf exists set snprintf d_snprintf eval $inlibc -- 1.8.3.1