From: H.Merijn Brand Date: Tue, 22 Jan 2008 16:52:32 +0000 (+0000) Subject: Regen. Lots of under-the-hood changes accumulated. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=776a38e31187f86a4a5b55c1719bc8c901a4e29a;p=p5sagit%2Fp5-mst-13.2.git Regen. Lots of under-the-hood changes accumulated. p4raw-id: //depot/perl@33038 --- diff --git a/Configure b/Configure index 3658695..fb29114 100755 --- a/Configure +++ b/Configure @@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Mon Jan 14 17:33:05 CET 2008 [metaconfig 3.0 PL70] +# Generated on Tue Jan 22 17:46:32 CET 2008 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <&4 - awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | (split -l 50 2>/dev/null || split -50) + awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" |\ + (split -l 50 2>/dev/null || split -50) rm -f missing tmppwd=`pwd` for filelist in x??; do - (cd "$rsrc"; ls `cat "$tmppwd/$filelist"` >/dev/null 2>>"$tmppwd/missing") + (cd "$rsrc"; ls `cat "$tmppwd/$filelist"` \ + >/dev/null 2>>"$tmppwd/missing") done if test -s missing; then cat missing >&4 @@ -2281,14 +2279,13 @@ for dir in \$*; do exit 0 elif test "X$_exe" != X -a -f \$thisthing$_exe; then echo \$thisthing - exit 0 + exit 0 elif test -f \$dir/\$thing.exe; then if test -n "$DJGPP"; then echo \$dir/\$thing.exe elif test "$eunicefix" != ":"; then : on Eunice apparently echo \$dir/\$thing - exit 0 fi exit 0 fi @@ -2319,7 +2316,6 @@ tr uniq " trylist=" -Mcc ar bison byacc @@ -3902,17 +3898,18 @@ esac prefix="$ans" prefixexp="$ansexp" -: is AFS running? +: allow them to override the AFS root case "$afsroot" in '') afsroot=/afs ;; *) afsroot=$afsroot ;; esac +: is AFS running? echo " " case "$afs" in $define|true) afs=true ;; $undef|false) afs=false ;; -*) if test -d $afsroot; then +*) if $test -d $afsroot; then afs=true else afs=false @@ -4341,6 +4338,23 @@ case "$usemorebits" in ;; esac +: Determine the C compiler to be used +echo " " +case "$cc" in +'') dflt=cc;; +*) dflt="$cc";; +esac +rp="Use which C compiler?" +. ./myread +cc="$ans" + +: See whether they have no cc but they do have gcc +. ./trygcc +if $test -f cc.cbu; then + . ./cc.cbu +fi +. ./checkcc + : make some quick guesses about what we are up against echo " " $echo $n "Hmm... $c" @@ -4436,25 +4450,6 @@ chmod +x bsd usg v7 osf1 eunice xenix venix os2 $eunicefix bsd usg v7 osf1 eunice xenix venix os2 $rm -f foo -: Checking the C compiler -case "$cc" in -'') dflt=cc;; -*) dflt="$cc";; -esac -rp="Use which C compiler?" -. ./myread -cc="$ans" - -: See if they have not cc but they do have gcc -. ./trygcc -: Look for a hint-file generated 'call-back-unit'. Now that the -: user has specified the compiler, we may need to set or change some -: other defaults. -if $test -f cc.cbu; then - . ./cc.cbu -fi -. ./checkcc - : Check if we are using GNU gcc and what its version is echo " " echo "Checking for GNU cc in disguise and/or its version number..." >&4 @@ -8379,7 +8374,7 @@ You can't have filenames longer than 14 chars. You can't even think about them! EOM val="$undef" -fi +fi set d_flexfnam eval $setvar $rm -rf 123456789abcde* @@ -8737,7 +8732,7 @@ case "$phostname" in ;; esac -: Ask for e-mail +: determine the e-mail address of the user who is running us $cat <' | $cppstdin $cppminus $cppflags 2>/dev/null | $grep '^[ ]*#.*include' | - $awk "{print \\$$fieldn}" | $sed 's!"!!g' | $sed 's!\\\\\\\\!/!g' | $sort | $uniq` + $awk "{print \\$$fieldn}" | $sed 's!"!!g' |\ + $sed 's!\\\\\\\\!/!g' | $sort | $uniq` fi -: Check this list of files to be sure we have parsed the cpp output ok. -: This will also avoid potentially non-existent files, such -: as ../foo/bar.h xxxfiles='' for xx in $xxx /dev/null ; do $test -f "$xx" && xxxfiles="$xxxfiles $xx" done -: If we have found no files, at least try signal.h case "$xxxfiles" in '') xxxfiles=`./findhdr signal.h` ;; esac @@ -20191,7 +20178,8 @@ $cat >>signal_cmd <<'EOS' set signal if eval $compile_ok; then - $run ./signal$_exe | ($sort -n -k 2 2>/dev/null || $sort -n +1) | $uniq | $awk -f signal.awk >signal.lst + $run ./signal$_exe | ($sort -n -k 2 2>/dev/null || $sort -n +1) |\ + $uniq | $awk -f signal.awk >signal.lst else echo "(I can't seem be able to compile the whole test program)" >&4 echo "(I'll try it in little pieces.)" >&4 @@ -21580,9 +21568,9 @@ if test -d ../UU; then cd .. fi -: configuration may be patched via a 'config.arch' file +: configuration may be unconditionally patched via a 'config.arch' file if $test -f config.arch; then - echo "I see a config.arch file, loading it." + echo "I see a config.arch file, loading it." >&4 . ./config.arch fi @@ -21630,13 +21618,16 @@ $startsh # Configured by : $cf_by # Target system : $myuname +EOT +$test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh +$spitshell <>config.sh + Author='$Author' Date='$Date' Header='$Header' Id='$Id' Locker='$Locker' Log='$Log' -Mcc='$Mcc' RCSfile='$RCSfile' Revision='$Revision' Source='$Source' @@ -22682,8 +22673,9 @@ echo "PERL_CONFIG_SH=true" >>config.sh : propagate old symbols if $test -f UU/config.sh; then UU/oldconfig.sh - sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' config.sh config.sh UU/oldconfig.sh |\ - $sort | $uniq -u >UU/oldsyms + $sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' \ + config.sh config.sh UU/oldconfig.sh |\ + $sort | $uniq -u >UU/oldsyms set X `cat UU/oldsyms` shift case $# in @@ -22692,7 +22684,7 @@ if $test -f UU/config.sh; then cat <>config.sh + echo ": Variables propagated from previous config.sh file." >>config.sh for sym in `cat UU/oldsyms`; do echo " Propagating $hint variable "'$'"$sym..." eval 'tmp="$'"${sym}"'"' diff --git a/Porting/Glossary b/Porting/Glossary index fcb14e8..a457ed5 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -34,7 +34,7 @@ afsroot (afs.U): This variable is by default set to '/afs'. In the unlikely case this is not the correct root, it is possible to override this with a hint value or command line option. This will be used in subsequent - tests for AFSness in the Perl configure and test process. + tests for AFSness in the configure and test process. alignbytes (alignbytes.U): This variable holds the number of bytes required to align a @@ -3672,11 +3672,6 @@ man3ext (man3dir.U): have: one of 'n', 'l', or '3'. The Makefile must supply the '.'. See man3dir. -Mcc (Loc.U): - This variable is used internally by Configure to determine the - full pathname (if any) of the Mcc program. After Configure runs, - the value is reset to a plain "Mcc" and is not useful. - mips_type (usrinc.U): This variable holds the environment type for the mips system. Possible values are "BSD 4.3" and "System V". diff --git a/config_h.SH b/config_h.SH index a69a2e3..5419d0c 100644 --- a/config_h.SH +++ b/config_h.SH @@ -5,10 +5,10 @@ : Set up for generating config_h.SH case "$CONFIG_SH" in -'') CONFIG_SH=config.sh ;; +'') CONFIG_SH=config.sh;; esac case "$CONFIG_H" in -'') CONFIG_H=config.h ;; +'') CONFIG_H=config.h;; esac case $PERL_CONFIG_SH in '') @@ -40,7 +40,7 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * that running config_h.SH again will wipe out any changes you've made. * For a more permanent change edit $CONFIG_SH and rerun config_h.SH. * - * \$Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ + * \$Id: Config_h.U 1 2006-08-24 12:32:52Z rmanfredi $ */ /* @@ -1842,8 +1842,8 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un /* HAS_POLL: * This symbol, if defined, indicates that the poll routine is - * available to poll active file descriptors. You may safely - * include when both this symbol *and* I_POLL are defined. + * available to poll active file descriptors. Please check I_POLL and + * I_SYS_POLL to know which header should be included as well. */ #$d_poll HAS_POLL /**/