(
usedevel => '',
optimize => '-g',
- cc => (`ccache --version`, $?) ? 'cc' : 'ccache cc',
ld => 'cc',
($linux64 ? (libpth => \@paths) : ()),
);
unless(GetOptions(\%options,
- 'target=s', 'jobs|j=i', 'expect-pass=i',
+ 'target=s', 'make=s', 'jobs|j=i', 'expect-pass=i',
'expect-fail' => sub { $options{'expect-pass'} = 0; },
- 'clean!', 'one-liner|e=s', 'match=s', 'force-manifest',
- 'force-regen', 'test-build', 'A=s@', 'l', 'w',
- 'check-args', 'check-shebang!', 'usage|help|?',
+ 'clean!', 'one-liner|e=s', 'c', 'l', 'w', 'match=s',
+ 'no-match=s' => sub {
+ $options{match} = $_[1];
+ $options{'expect-pass'} = 0;
+ },
+ 'force-manifest', 'force-regen', 'test-build', 'validate',
+ 'check-args', 'check-shebang!', 'usage|help|?', 'A=s@',
'D=s@' => sub {
my (undef, $val) = @_;
if ($val =~ /\A([^=]+)=(.*)/s) {
my ($target, $j, $match) = @options{qw(target jobs match)};
-pod2usage(exitval => 255, verbose => 1) if $options{usage};
+@ARGV = ('sh', '-c', 'cd t && ./perl TEST base/*.t')
+ if $options{validate} && !@ARGV;
+
+pod2usage(exitval => 0, verbose => 2) if $options{usage};
pod2usage(exitval => 255, verbose => 1)
unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
pod2usage(exitval => 255, verbose => 1)
if !$options{'one-liner'} && ($options{l} || $options{w});
-check_shebang($ARGV[0]) if $options{'check-shebang'} && @ARGV;
+check_shebang($ARGV[0])
+ if $options{'check-shebang'} && @ARGV && !$options{match};
exit 0 if $options{'check-args'};
.../Porting/bisect.pl --expect-fail --match '\buseithreads\b'
# When did this test program stop working?
.../Porting/bisect.pl -- ./perl -Ilib ../test_prog.pl
+ # When did this test start failing?
+ .../Porting/bisect.pl -- ./perl -Ilib t/TEST op/sort.t
# When did this first become valid syntax?
.../Porting/bisect.pl --target=miniperl --end=v5.10.0 \
--expect-fail -e 'my $a := 2;'
=item *
-Which commit added the first to match this regex?
+Which commit added the first file to match this regex?
=item *
-Which commit removed the last to match this regex?
+Which commit removed the last file to match this regex?
=back
By default F<bisect.pl> will process all options, then use the rest of the
command line as arguments to list C<system> to run a test case. By default,
the test case should pass (exit with 0) on earlier perls, and fail (exit
-non-zero) on I<blead>. F<bisect.pl> will use F<bisect-runner.pl> to find the
-earliest stable perl version on which the test case passes, check that it
-fails on blead, and then use F<bisect-runner.pl> with C<git bisect run> to
-find the commit which caused the failure.
+non-zero) on I<blead> (note that running most of perl's test files directly
+won't do this, you'll need to run them through a harness to get the proper
+error code). F<bisect.pl> will use F<bisect-runner.pl> to find the earliest
+stable perl version on which the test case passes, check that it fails on
+blead, and then use F<bisect-runner.pl> with C<git bisect run> to find the
+commit which caused the failure.
Because the test case is the complete argument to C<system>, it is easy to
run something other than the F<perl> built, if necessary. If you need to run
Earliest revision to test, as a I<commit-ish> (a tag, commit or anything
else C<git> understands as a revision). If not specified, F<bisect.pl> will
-search stable perl releases from 5.002 to 5.14.0 until it finds one where
-the test case passes.
+search stable perl releases until it finds one where the test case passes.
+The default is to search from 5.002 to 5.14.0. If F<bisect.pl> detects that
+the checkout is on a case insensitive file system, it will search from
+5.005 to 5.14.0
=item *
=item *
+-c
+
+Add C<-c> to the command line, to cause perl to exit after syntax checking.
+
+=item *
+
-l
Add C<-l> to the command line with C<-e>
Add C<-w> to the command line with C<-e>
-It's not valid to pass C<-l> or C<-w> to C<bisect.pl> unless you are also
-using C<-e>
+It's not valid to pass C<-c>, C<-l> or C<-w> to C<bisect.pl> unless you are
+also using C<-e>
=item *
=item *
+--make I<make-prog>
+
+The C<make> command to use. If this not set, F<make> is used. If this is
+set, it also adds a C<-Dmake=...> else some recursive make invocations
+in extensions may fail. Typically one would use this as C<--make gmake>
+to use F<gmake> in place of the system F<make>.
+
+=item *
+
--jobs I<jobs>
=item *
--match pattern
-Instead of running a test program to determine I<pass> or I<fail>, pass
-if the given regex matches, and hence search for the commit that removes
-the last matching file.
+=item *
+
+--no-match pattern
+
+Instead of running a test program to determine I<pass> or I<fail>,
+C<--match> will pass if the given regex matches, and hence search for the
+commit that removes the last matching file. C<--no-match> inverts the test,
+to search for the first commit that adds files that match.
+
+The remaining command line arguments are treated as glob patterns for files
+to match against. If none are specified, then they default as follows:
+
+=over 4
+
+=item *
If no I<target> is specified, the match is against all files in the
-repository (which is fast). If a I<target> is specified, that target is
-built, and the match is against only the built files. C<--expect-fail> can
-be used with C<--match> to search for a commit that adds files that match.
+repository (which is fast).
+
+=item *
+
+If a I<target> is specified, that target is built, and the match is against
+only the built files.
+
+=back
+
+Treating the command line arguments as glob patterns should not cause
+problems, as the perl distribution has never shipped or built files with
+names that contain characters which are globbing metacharacters.
+
+Anything which is not a readable file is ignored, instead of generating an
+error. (If you want an error, run C<grep> or C<ack> as a test case). This
+permits one to easily search in a file that changed its name. For example:
+
+ .../Porting/bisect.pl --match 'Pod.*Functions' 'pod/buildtoc*'
+
+C<--no-match ...> is implemented as C<--expect-fail --match ...>
=item *
--validate
Test that all stable revisions can be built. By default, attempts to build
-I<blead>, I<v5.14.0> .. I<perl-5.002>. Stops at the first failure, without
+I<blead>, I<v5.14.0> .. I<perl-5.002> (or I<perl5.005> on a case insensitive
+file system). Stops at the first failure, without
cleaning the checkout. Use I<--start> to specify the earliest revision to
test, I<--end> to specify the most recent. Useful for validating a new
OS/CPU/compiler combination. For example
die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
+unless (exists $defines{cc}) {
+ # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
+ # confusing.
+ # FIXME - really it should be replaced with a proper test of
+ # "can we build something?" and a helpful diagnostic if we can't.
+ # For now, simply move it here.
+ $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
+}
+
$j = "-j$j" if $j =~ /\A\d+\z/;
+if (exists $options{make}) {
+ if (!exists $defines{make}) {
+ $defines{make} = $options{make};
+ }
+} else {
+ $options{make} = 'make';
+}
+
# Sadly, however hard we try, I don't think that it will be possible to build
# modules in ext/ on x86_64 Linux before commit e1666bf5602ae794 on 1999/12/29,
# which updated to MakeMaker 3.7, which changed from using a hard coded ld
close_or_die($fh);
}
-sub apply_patch {
- my $patch = shift;
+# AIX supplies a pre-historic patch program, which certainly predates Linux
+# and is probably older than NT. It can't cope with unified diffs. Meanwhile,
+# it's hard enough to get git diff to output context diffs, let alone git show,
+# and nearly all the patches embedded here are unified. So it seems that the
+# path of least resistance is to convert unified diffs to context diffs:
+
+sub process_hunk {
+ my ($from_out, $to_out, $has_from, $has_to, $delete, $add) = @_;
+ ++$$has_from if $delete;
+ ++$$has_to if $add;
+
+ if ($delete && $add) {
+ $$from_out .= "! $_\n" foreach @$delete;
+ $$to_out .= "! $_\n" foreach @$add;
+ } elsif ($delete) {
+ $$from_out .= "- $_\n" foreach @$delete;
+ } elsif ($add) {
+ $$to_out .= "+ $_\n" foreach @$add;
+ }
+}
+
+# This isn't quite general purpose, as it can't cope with
+# '\ No newline at end of file'
+sub ud2cd {
+ my $diff_in = shift;
+ my $diff_out = '';
+
+ # Stuff before the diff
+ while ($diff_in =~ s/\A(?!\*\*\* )(?!--- )([^\n]*\n?)//ms && length $1) {
+ $diff_out .= $1;
+ }
+
+ if (!length $diff_in) {
+ die "That didn't seem to be a diff";
+ }
+
+ if ($diff_in =~ /\A\*\*\* /ms) {
+ warn "Seems to be a context diff already\n";
+ return $diff_out . $diff_in;
+ }
+
+ # Loop for files
+ FILE: while (1) {
+ if ($diff_in =~ s/\A((?:diff |index )[^\n]+\n)//ms) {
+ $diff_out .= $1;
+ next;
+ }
+ if ($diff_in !~ /\A--- /ms) {
+ # Stuff after the diff;
+ return $diff_out . $diff_in;
+ }
+ $diff_in =~ s/\A([^\n]+\n?)//ms;
+ my $line = $1;
+ die "Can't parse '$line'" unless $line =~ s/\A--- /*** /ms;
+ $diff_out .= $line;
+ $diff_in =~ s/\A([^\n]+\n?)//ms;
+ $line = $1;
+ die "Can't parse '$line'" unless $line =~ s/\A\+\+\+ /--- /ms;
+ $diff_out .= $line;
+
+ # Loop for hunks
+ while (1) {
+ next FILE
+ unless $diff_in =~ s/\A\@\@ (-([0-9]+),([0-9]+) \+([0-9]+),([0-9]+)) \@\@[^\n]*\n?//;
+ my ($hunk, $from_start, $from_count, $to_start, $to_count)
+ = ($1, $2, $3, $4, $5);
+ my $from_end = $from_start + $from_count - 1;
+ my $to_end = $to_start + $to_count - 1;
+ my ($from_out, $to_out, $has_from, $has_to, $add, $delete);
+ while (length $diff_in && ($from_count || $to_count)) {
+ die "Confused in $hunk" unless $diff_in =~ s/\A([^\n]*)\n//ms;
+ my $line = $1;
+ $line = ' ' unless length $line;
+ if ($line =~ /^ .*/) {
+ process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
+ $delete, $add);
+ undef $delete;
+ undef $add;
+ $from_out .= " $line\n";
+ $to_out .= " $line\n";
+ --$from_count;
+ --$to_count;
+ } elsif ($line =~ /^-(.*)/) {
+ push @$delete, $1;
+ --$from_count;
+ } elsif ($line =~ /^\+(.*)/) {
+ push @$add, $1;
+ --$to_count;
+ } else {
+ die "Can't parse '$line' as part of hunk $hunk";
+ }
+ }
+ process_hunk(\$from_out, \$to_out, \$has_from, \$has_to,
+ $delete, $add);
+ die "No lines in hunk $hunk"
+ unless length $from_out || length $to_out;
+ die "No changes in hunk $hunk"
+ unless $has_from || $has_to;
+ $diff_out .= "***************\n";
+ $diff_out .= "*** $from_start,$from_end ****\n";
+ $diff_out .= $from_out if $has_from;
+ $diff_out .= "--- $to_start,$to_end ----\n";
+ $diff_out .= $to_out if $has_to;
+ }
+ }
+}
+
+{
+ my $use_context;
+
+ sub placate_patch_prog {
+ my $patch = shift;
+
+ if (!defined $use_context) {
+ my $version = `patch -v 2>&1`;
+ die "Can't run `patch -v`, \$?=$?, bailing out"
+ unless defined $version;
+ if ($version =~ /Free Software Foundation/) {
+ $use_context = 0;
+ } elsif ($version =~ /Header: patch\.c,v.*\blwall\b/) {
+ # The system patch is older than Linux, and probably older than
+ # Windows NT.
+ $use_context = 1;
+ } else {
+ # Don't know.
+ $use_context = 0;
+ }
+ }
+
+ return $use_context ? ud2cd($patch) : $patch;
+ }
+}
- my ($file) = $patch =~ qr!^--- a/(\S+)\n\+\+\+ b/\1!sm;
+sub apply_patch {
+ my ($patch, $what, $files) = @_;
+ $what = 'patch' unless defined $what;
+ unless (defined $files) {
+ $patch =~ m!^--- a/(\S+)\n\+\+\+ b/\1!sm;
+ $files = " $1";
+ }
+ my $patch_to_use = placate_patch_prog($patch);
open my $fh, '|-', 'patch', '-p1' or die "Can't run patch: $!";
- print $fh $patch;
+ print $fh $patch_to_use;
return if close $fh;
print STDERR "Patch is <<'EOPATCH'\n${patch}EOPATCH\n";
- die "Can't patch $file: $?, $!";
+ print STDERR "\nConverted to a context diff <<'EOCONTEXT'\n${patch_to_use}EOCONTEXT\n"
+ if $patch_to_use ne $patch;
+ die "Can't $what$files: $?, $!";
}
sub apply_commit {
my ($commit, @files) = @_;
- return unless system "git show $commit @files | patch -p1";
- die "Can't apply commit $commit to @files" if @files;
- die "Can't apply commit $commit";
+ my $patch = `git show $commit @files`;
+ if (!defined $patch) {
+ die "Can't get commit $commit for @files: $?" if @files;
+ die "Can't get commit $commit: $?";
+ }
+ apply_patch($patch, "patch $commit", @files ? " for @files" : '');
}
sub revert_commit {
my ($commit, @files) = @_;
- return unless system "git show -R $commit @files | patch -p1";
- die "Can't apply revert $commit from @files" if @files;
- die "Can't apply revert $commit";
+ my $patch = `git show -R $commit @files`;
+ if (!defined $patch) {
+ die "Can't get revert commit $commit for @files: $?" if @files;
+ die "Can't get revert commit $commit: $?";
+ }
+ apply_patch($patch, "revert $commit", @files ? " for @files" : '');
}
sub checkout_file {
}
sub match_and_exit {
- my $target = shift;
+ my ($target, @globs) = @_;
my $matches = 0;
my $re = qr/$match/;
my @files;
- {
+ if (@globs) {
+ require File::Glob;
+ foreach (sort map { File::Glob::bsd_glob($_)} @globs) {
+ if (!-f $_ || !-r _) {
+ warn "Skipping matching '$_' as it is not a readable file\n";
+ } else {
+ push @files, $_;
+ }
+ }
+ } else {
local $/ = "\0";
@files = defined $target ? `git ls-files -o -z`: `git ls-files -z`;
chomp @files;
system 'git clean -dxf </dev/null' and die;
if (!defined $target) {
- match_and_exit() if $match;
+ match_and_exit(undef, @ARGV) if $match;
$target = 'test_prep';
}
skip('no Configure - is this the //depot/perlext/Compiler branch?')
unless -f 'Configure';
+my $case_insensitive;
+{
+ my ($dev_C, $ino_C) = stat 'Configure';
+ die "Could not stat Configure: $!" unless defined $dev_C;
+ my ($dev_c, $ino_c) = stat 'configure';
+ ++$case_insensitive
+ if defined $dev_c && $dev_C == $dev_c && $ino_C == $ino_c;
+}
+
# This changes to PERL_VERSION in 4d8076ea25903dcb in 1999
my $major
= extract_from_file('patchlevel.h',
}
if ($target =~ /config\.s?h/) {
- match_and_exit($target) if $match && -f $target;
+ match_and_exit($target, @ARGV) if $match && -f $target;
report_and_exit(!-f $target, 'could build', 'could not build', $target)
if $options{'test-build'};
+ skip("could not build $target") unless -f $target;
+
my $ret = system @ARGV;
report_and_exit($ret, 'zero exit from', 'non-zero exit from', "@ARGV");
} elsif (!-f 'config.sh') {
patch_ext();
# Parallel build for miniperl is safe
-system "make $j miniperl </dev/null";
+system "$options{make} $j miniperl </dev/null";
-my $expected = $target =~ /^test/ ? 't/perl'
+# This is the file we expect make to create
+my $expected_file = $target =~ /^test/ ? 't/perl'
: $target eq 'Fcntl' ? "lib/auto/Fcntl/Fcntl.$Config{so}"
: $target;
-my $real_target = $target eq 'Fcntl' ? $expected : $target;
+# This is the target we tell make to build in order to get $expected_file
+my $real_target = $target eq 'Fcntl' ? $expected_file : $target;
if ($target ne 'miniperl') {
# Nearly all parallel build issues fixed by 5.10.0. Untrustworthy before that.
}
}
- system "make $j $real_target </dev/null";
+ system "$options{make} $j $real_target </dev/null";
}
-my $missing_target = $expected =~ /perl$/ ? !-x $expected : !-r $expected;
+my $expected_file_found = $expected_file =~ /perl$/
+ ? -x $expected_file : -r $expected_file;
+
+if ($expected_file_found && $expected_file eq 't/perl') {
+ # Check that it isn't actually pointing to ../miniperl, which will happen
+ # if the sanity check ./miniperl -Ilib -MExporter -e '<?>' fails, and
+ # Makefile tries to run minitest.
+
+ # Of course, helpfully sometimes it's called ../perl, other times .././perl
+ # and who knows if that list is exhaustive...
+ my ($dev0, $ino0) = stat 't/perl';
+ my ($dev1, $ino1) = stat 'perl';
+ unless (defined $dev0 && defined $dev1 && $dev0 == $dev1 && $ino0 == $ino1) {
+ undef $expected_file_found;
+ my $link = readlink $expected_file;
+ warn "'t/perl' => '$link', not 'perl'";
+ die "Could not realink t/perl: $!" unless defined $link;
+ }
+}
if ($options{'test-build'}) {
- report_and_exit($missing_target, 'could build', 'could not build',
+ report_and_exit(!$expected_file_found, 'could build', 'could not build',
$real_target);
-} elsif ($missing_target) {
+} elsif (!$expected_file_found) {
skip("could not build $real_target");
}
-match_and_exit($real_target) if $match;
+match_and_exit($real_target, @ARGV) if $match;
if (defined $options{'one-liner'}) {
my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
unshift @ARGV, '-e', $options{'one-liner'};
- unshift @ARGV, '-l' if $options{l};
- unshift @ARGV, '-w' if $options{w};
+ foreach (qw(c l w)) {
+ unshift @ARGV, "-$_" if $options{$_};
+ }
unshift @ARGV, "./$exe", '-Ilib';
}
EOPATCH
}
+ if ($major < 8 && $^O eq 'aix') {
+ edit_file('Configure', sub {
+ my $code = shift;
+ # Replicate commit a8c676c69574838b
+ # Whitespace allowed at the ends of /lib/syscalls.exp lines
+ # and half of commit c6912327ae30e6de
+ # AIX syscalls.exp scan: the syscall might be marked 32, 3264, or 64
+ $code =~ s{(\bsed\b.*\bsyscall)(?:\[0-9\]\*)?(\$.*/lib/syscalls\.exp)}
+ {$1 . "[0-9]*[ \t]*" . $2}e;
+ return $code;
+ });
+ }
+
if ($major < 8 && !extract_from_file('Configure',
qr/^\t\tif test ! -t 0; then$/)) {
# Before dfe9444ca7881e71, Configure would refuse to run if stdin was
# to 5.002, lets just turn it off.
$code =~ s/^useshrplib='true'/useshrplib='false'/m
if $faking_it;
+
+ # Part of commit d235852b65d51c44
+ # Don't do this on a case sensitive HFS+ partition, as it
+ # breaks the build for 5.003 and earlier.
+ if ($case_insensitive
+ && $code !~ /^firstmakefile=GNUmakefile/) {
+ $code .= "\nfirstmakefile=GNUmakefile;\n";
+ }
+
return $code;
});
}
cccdlflags="-DPIC -fPIC $cccdlflags"
lddlflags="--whole-archive -shared $lddlflags"
elif [ "`uname -m`" = "pmax" ]; then
-# NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work.
+# NetBSD 1.3 and 1.3.1 on pmax shipped an 'old' ld.so, which will not work.
d_dlopen=$undef
elif [ -f /usr/libexec/ld.so ]; then
d_dlopen=$define
}
}
+ if ($^O eq 'aix' && $major >= 11 && $major <= 15
+ && extract_from_file('makedef.pl', qr/^use Config/)) {
+ edit_file('Makefile.SH', sub {
+ # The AIX part of commit e6807d8ab22b761c
+ # It's safe to substitute lib/Config.pm for config.sh
+ # as lib/Config.pm depends on config.sh
+ # If the tree is post e6807d8ab22b761c, the substitution
+ # won't match, which is harmless.
+ my $code = shift;
+ $code =~ s{^(perl\.exp:.* )config\.sh(\b.*)}
+ {$1 . '$(CONFIGPM)' . $2}me;
+ return $code;
+ });
+ }
+
# There was a bug in makedepend.SH which was fixed in version 96a8704c.
# Symptom was './makedepend: 1: Syntax error: Unterminated quoted string'
# Remove this if you're actually bisecting a problem related to
});
}
+ if ($major < 5 && $^O eq 'aix'
+ && !extract_from_file('pp_sys.c',
+ qr/defined\(HOST_NOT_FOUND\) && !defined\(h_errno\)/)) {
+ # part of commit dc45a647708b6c54
+ # Andy Dougherty's configuration patches (Config_63-01 up to 04).
+ apply_patch(<<'EOPATCH')
+diff --git a/pp_sys.c b/pp_sys.c
+index c2fcb6f..efa39fb 100644
+--- a/pp_sys.c
++++ b/pp_sys.c
+@@ -54,7 +54,7 @@ extern "C" int syscall(unsigned long,...);
+ #endif
+ #endif
+
+-#ifdef HOST_NOT_FOUND
++#if defined(HOST_NOT_FOUND) && !defined(h_errno)
+ extern int h_errno;
+ #endif
+
+EOPATCH
+ }
+
+ if ($major == 5
+ && `git rev-parse HEAD` eq "22c35a8c2392967a5ba6b5370695be464bd7012c\n") {
+ # Commit 22c35a8c2392967a is significant,
+ # "phase 1 of somewhat major rearrangement of PERL_OBJECT stuff"
+ # but doesn't build due to 2 simple errors. blead in this broken state
+ # was merged to the cfgperl branch, and then these were immediately
+ # corrected there. cfgperl (with the fixes) was merged back to blead.
+ # The resultant rather twisty maze of commits looks like this:
+
+=begin comment
+
+* | | commit 137225782c183172f360c827424b9b9f8adbef0e
+|\ \ \ Merge: 22c35a8 2a8ee23
+| |/ / Author: Gurusamy Sarathy <gsar@cpan.org>
+| | | Date: Fri Oct 30 17:38:36 1998 +0000
+| | |
+| | | integrate cfgperl tweaks into mainline
+| | |
+| | | p4raw-id: //depot/perl@2144
+| | |
+| * | commit 2a8ee23279873759693fa83eca279355db2b665c
+| | | Author: Jarkko Hietaniemi <jhi@iki.fi>
+| | | Date: Fri Oct 30 13:27:39 1998 +0000
+| | |
+| | | There can be multiple yacc/bison errors.
+| | |
+| | | p4raw-id: //depot/cfgperl@2143
+| | |
+| * | commit 93fb2ac393172fc3e2c14edb20b718309198abbc
+| | | Author: Jarkko Hietaniemi <jhi@iki.fi>
+| | | Date: Fri Oct 30 13:18:43 1998 +0000
+| | |
+| | | README.posix-bc update.
+| | |
+| | | p4raw-id: //depot/cfgperl@2142
+| | |
+| * | commit 4ec43091e8e6657cb260b5e563df30aaa154effe
+| | | Author: Jarkko Hietaniemi <jhi@iki.fi>
+| | | Date: Fri Oct 30 09:12:59 1998 +0000
+| | |
+| | | #2133 fallout.
+| | |
+| | | p4raw-id: //depot/cfgperl@2141
+| | |
+| * | commit 134ca994cfefe0f613d43505a885e4fc2100b05c
+| |\ \ Merge: 7093112 22c35a8
+| |/ / Author: Jarkko Hietaniemi <jhi@iki.fi>
+|/| | Date: Fri Oct 30 08:43:18 1998 +0000
+| | |
+| | | Integrate from mainperl.
+| | |
+| | | p4raw-id: //depot/cfgperl@2140
+| | |
+* | | commit 22c35a8c2392967a5ba6b5370695be464bd7012c
+| | | Author: Gurusamy Sarathy <gsar@cpan.org>
+| | | Date: Fri Oct 30 02:51:39 1998 +0000
+| | |
+| | | phase 1 of somewhat major rearrangement of PERL_OBJECT stuff
+| | | (objpp.h is gone, embed.pl now does some of that); objXSUB.h
+| | | should soon be automated also; the global variables that
+| | | escaped the PL_foo conversion are now reined in; renamed
+| | | MAGIC in regcomp.h to REG_MAGIC to avoid collision with the
+| | | type of same name; duplicated lists of pp_things in various
+| | | places is now gone; result has only been tested on win32
+| | |
+| | | p4raw-id: //depot/perl@2133
+
+=end comment
+
+=cut
+
+ # and completely confuses git bisect (and at least me), causing it to
+ # the bisect run to confidently return the wrong answer, an unrelated
+ # commit on the cfgperl branch.
+
+ apply_commit('4ec43091e8e6657c');
+ }
+
+ if ($major == 5
+ && extract_from_file('pp_sys.c', qr/PERL_EFF_ACCESS_R_OK/)
+ && !extract_from_file('pp_sys.c', qr/XXX Configure test needed for eaccess/)) {
+ # Between 5ff3f7a4e03a6b10 and c955f1177b2e311d^
+ # This is the meat of commit c955f1177b2e311d (without the other
+ # indenting changes that would cause a conflict).
+ # Without this 538 revisions won't build on (at least) Linux
+ apply_patch(<<'EOPATCH');
+diff --git a/pp_sys.c b/pp_sys.c
+index d60c8dc..867dee4 100644
+--- a/pp_sys.c
++++ b/pp_sys.c
+@@ -198,9 +198,18 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true";
+ # if defined(I_SYS_SECURITY)
+ # include <sys/security.h>
+ # endif
+-# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
+-# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
+-# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
++ /* XXX Configure test needed for eaccess */
++# ifdef ACC_SELF
++ /* HP SecureWare */
++# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK, ACC_SELF))
++# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK, ACC_SELF))
++# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK, ACC_SELF))
++# else
++ /* SCO */
++# define PERL_EFF_ACCESS_R_OK(p) (eaccess((p), R_OK))
++# define PERL_EFF_ACCESS_W_OK(p) (eaccess((p), W_OK))
++# define PERL_EFF_ACCESS_X_OK(p) (eaccess((p), X_OK))
++# endif
+ #endif
+
+ #if !defined(PERL_EFF_ACCESS_R_OK) && defined(HAS_ACCESSX) && defined(ACC_SELF)
+EOPATCH
+ }
+
+ if ($major == 5
+ && extract_from_file('mg.c', qr/If we're still on top of the stack, pop us off/)
+ && !extract_from_file('mg.c', qr/PL_savestack_ix -= popval/)) {
+ # Fix up commit 455ece5e082708b1:
+ # SSNEW() API for allocating memory on the savestack
+ # Message-Id: <tqemtae338.fsf@puma.genscan.com>
+ # Subject: [PATCH 5.005_51] (was: why SAVEDESTRUCTOR()...)
+ apply_commit('3c8a44569607336e', 'mg.c');
+ }
+
+ if ($major == 5) {
+ if (extract_from_file('doop.c', qr/croak\(no_modify\);/)
+ && extract_from_file('doop.c', qr/croak\(PL_no_modify\);/)) {
+ # Whilst the log suggests that this would only fix 5 commits, in
+ # practice this area of history is a complete tarpit, and git bisect
+ # gets very confused by the skips in the middle of the back and
+ # forth merging between //depot/perl and //depot/cfgperl
+ apply_commit('6393042b638dafd3');
+ }
+
+ # One error "fixed" with another:
+ if (extract_from_file('pp_ctl.c',
+ qr/\Qstatic void *docatch_body _((void *o));\E/)) {
+ apply_commit('5b51e982882955fe');
+ }
+ # Which is then fixed by this:
+ if (extract_from_file('pp_ctl.c',
+ qr/\Qstatic void *docatch_body _((valist\E/)) {
+ apply_commit('47aa779ee4c1a50e');
+ }
+
+ if (extract_from_file('thrdvar.h', qr/PERLVARI\(Tprotect/)
+ && !extract_from_file('embedvar.h', qr/PL_protect/)) {
+ # Commit 312caa8e97f1c7ee didn't update embedvar.h
+ apply_commit('e0284a306d2de082', 'embedvar.h');
+ }
+ }
+
+ if ($major == 5
+ && extract_from_file('sv.c',
+ qr/PerlDir_close\(IoDIRP\((?:\(IO\*\))?sv\)\);/)
+ && !(extract_from_file('toke.c',
+ qr/\QIoDIRP(FILTER_DATA(AvFILLp(PL_rsfp_filters))) = NULL\E/)
+ || extract_from_file('toke.c',
+ qr/\QIoDIRP(datasv) = (DIR*)NULL;\E/))) {
+ # Commit 93578b34124e8a3b, //depot/perl@3298
+ # close directory handles properly when localized,
+ # tweaked slightly by commit 1236053a2c722e2b,
+ # add test case for change#3298
+ #
+ # The fix is the last part of:
+ #
+ # various fixes for clean build and test on win32; configpm broken,
+ # needed to open myconfig.SH rather than myconfig; sundry adjustments
+ # to bytecode stuff; tweaks to DYNAMIC_ENV_FETCH code to make it
+ # work under win32; getenv_sv() changed to getenv_len() since SVs
+ # aren't visible in the lower echelons; remove bogus exports from
+ # config.sym; PERL_OBJECT-ness for C++ exception support; null out
+ # IoDIRP in filter_del() or sv_free() will attempt to close it
+ #
+ # The changed code is modified subsequently by commit e0c198038146b7a4
+ apply_commit('a6c403648ecd5cc7', 'toke.c');
+ }
+
if ($major < 6 && $^O eq 'netbsd'
&& !extract_from_file('unixish.h',
qr/defined\(NSIG\).*defined\(__NetBSD__\)/)) {
apply_commit('6695a346c41138df');
}
+ if (-f 'ext/Hash/Util/Makefile.PL'
+ && extract_from_file('ext/Hash/Util/Makefile.PL',
+ qr/\bDIR\b.*'FieldHash'/)) {
+ # ext/Hash/Util/Makefile.PL should not recurse to FieldHash's Makefile.PL
+ # *nix, VMS and Win32 all know how to (and have to) call the latter directly.
+ # As is, targets in ext/Hash/Util/FieldHash get called twice, which may result
+ # in race conditions, and certainly messes up make clean; make distclean;
+ apply_commit('550428fe486b1888');
+ }
+
if ($major < 8 && $^O eq 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') {
checkout_file('ext/DynaLoader/dl_dyld.xs', 'f556e5b971932902');
apply_patch(<<'EOPATCH');