diff options
| author | H.Merijn Brand <h.m.brand@xs4all.nl> | 2001-05-22 13:49:37 +0200 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-05-24 14:04:41 +0000 |
| commit | 151e6568b976f25c334d8e44f3b0ab7e305d7beb (patch) | |
| tree | c64c328120f4f0296bb3f8d882b4fde61337ef74 | |
| parent | c8f392da2bce19a4e929f15aae950a6983de61f2 (diff) | |
| download | perl-151e6568b976f25c334d8e44f3b0ab7e305d7beb.tar.gz | |
Re: [ID 20010521.004] Two test suite failures on this platform with latest rsync
Message-Id: <20010522114044.BC4E.H.M.BRAND@hccnet.nl>
p4raw-id: //depot/perl@10196
| -rwxr-xr-x | Configure | 19 | ||||
| -rw-r--r-- | myconfig.SH | 7 |
2 files changed, 23 insertions, 3 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Wed May 16 17:18:11 EET DST 2001 [metaconfig 3.0 PL70] +# Generated on Thu May 24 17:54:36 EET DST 2001 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -816,6 +816,7 @@ api_subversion='' api_version='' api_versionstring='' patchlevel='' +perl_patchlevel='' revision='' subversion='' version='' @@ -6001,6 +6002,7 @@ if $test -r $rsrc/patchlevel.h;then api_revision=`awk '/define[ ]+PERL_API_REVISION/ {print $3}' $rsrc/patchlevel.h` api_version=`awk '/define[ ]+PERL_API_VERSION/ {print $3}' $rsrc/patchlevel.h` api_subversion=`awk '/define[ ]+PERL_API_SUBVERSION/ {print $3}' $rsrc/patchlevel.h` + perl_patchlevel=`grep ',"DEVEL[0-9][0-9]*"' $rsrc/patchlevel.h|sed 's/[^0-9]//g'` else revision=0 patchlevel=0 @@ -6008,8 +6010,19 @@ else api_revision=0 api_version=0 api_subversion=0 + perl_patchlevel=0 + $echo "(You do not have patchlevel.h. Eek.)" fi -$echo "(You have $package version $patchlevel subversion $subversion.)" +if $test -r $rsrc/.patch ; then + if $test "`cat $rsrc/.patch`" -gt "$perl_patchlevel" ; then + perl_patchlevel=`cat $rsrc/.patch` + fi +fi +case "$perl_patchlevel" in +0) ;; +'') $echo "(You have $package version $patchlevel subversion $subversion.)" ;; +*) $echo "(You have $package version $patchlevel subversion $subversion patchlevel $perl_patchlevel.)" ;; +esac case "$osname" in dos|vms) : XXX Should be a Configure test for double-dots in filenames. @@ -16713,6 +16726,7 @@ patchlevel='$patchlevel' path_sep='$path_sep' perl5='$perl5' perl='$perl' +perl_patchlevel='$perl_patchlevel' perladmin='$perladmin' perllibs='$perllibs' perlpath='$perlpath' @@ -16892,6 +16906,7 @@ $test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh : add special variables $test -f $src/patchlevel.h && \ awk '/^#define[ ]+PERL_/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh +echo "PERL_PATCHLEVEL=$perl_patchlevel" >>config.sh echo "PERL_CONFIG_SH=true" >>config.sh : propagate old symbols diff --git a/myconfig.SH b/myconfig.SH index 59a173d0d0..3635dd72dc 100644 --- a/myconfig.SH +++ b/myconfig.SH @@ -12,6 +12,11 @@ case $PERL_CONFIG_SH in . $TOP/config.sh ;; esac +if $test "$PERL_PATCHLEVEL" -gt 0 ; then + patchlevel=" patchlevel $PERL_PATCHLEVEL" +else + patchlevel="" +fi : This forces SH files to create target in same directory as SH file. : This is so that make depend always knows where to find SH derivatives. case "$0" in @@ -27,7 +32,7 @@ $startsh # Note that the text lines /^Summary of/ .. /^\s*$/ are copied into Config.pm. cat <<'!NO!SUBS!' -Summary of my $package (revision $baserev version $PERL_VERSION subversion $PERL_SUBVERSION) configuration: +Summary of my $package (revision $baserev version $PERL_VERSION subversion $PERL_SUBVERSION$patchlevel) configuration: Platform: osname=$osname, osvers=$osvers, archname=$archname uname='$myuname' |