From: Peter Prymmer Date: Wed, 12 Jun 2002 18:58:50 +0000 (-0400) Subject: add skipping of threads and threads::shared on default builds X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=345d73cfd9677ddcbcfc43412ba14d8c2d2004dd;p=p5sagit%2Fp5-mst-13.2.git add skipping of threads and threads::shared on default builds Message-ID: p4raw-id: //depot/perl@17211 --- diff --git a/utils/perlivp.PL b/utils/perlivp.PL index fa7a839..fd58e87 100644 --- a/utils/perlivp.PL +++ b/utils/perlivp.PL @@ -14,9 +14,9 @@ use Cwd; # This forces PL files to create target in same directory as PL file. # This is so that make depend always knows where to find PL derivatives. -$origdir = cwd; +my $origdir = cwd; chdir dirname($0); -$file = basename($0, '.PL'); +my $file = basename($0, '.PL'); $file .= '.com' if $^O eq 'VMS'; # Create output file. @@ -37,7 +37,7 @@ $Config{'startperl'} print OUT <<'!NO!SUBS!'; -# perlivp V 0.01 +# perlivp V 0.02 sub usage { @@ -56,7 +56,7 @@ Usage: exit; } -use vars (%opt); # allow testing with older versions (do not use our) +use vars qw(%opt); # allow testing with older versions (do not use our) @opt{ qw/? H h P p V v/ } = qw(0 0 0 0 0 0 0); @@ -88,8 +88,15 @@ if (defined($Config{'perlpath'})) { $perlpath = $Config{'perlpath'}; } # Of course some platforms are distinct... if ($^O eq 'VMS') { $perlpath = $^X; } +# The useithreads Config variable plays a role in whether or not +# threads and threads/shared work when Cd. They apparently always +# get installed on systems that can run Configure. +my $useithreads = ''; +if (defined($Config{'useithreads'})) { $useithreads = $Config{'useithreads'}; } + print OUT <<"!GROK!THIS!"; my \$perlpath = '$perlpath'; +my \$useithreads = '$useithreads'; !GROK!THIS! print OUT <<'!NO!SUBS!'; @@ -199,6 +206,10 @@ if (defined($Config{'extensions'})) { my @extensions = split(/\s+/,$Config{'extensions'}); foreach (@extensions) { next if ($_ eq ''); + if ( $useithreads !~ /define/i ) { + next if ($_ eq 'threads'); + next if ($_ eq 'threads/shared'); + } next if ($_ eq 'Devel/DProf'); # VMS$ perl -e "eval ""require \""Devel/DProf.pm\"";"" print $@" # \NT> perl -e "eval \"require 'Devel/DProf.pm'\"; print $@"