Skip to content

Commit d40d6ec

Browse files
committed
bisect.pl should fall back on makedepend.SH from v5.34.0, not blead.
Post v5.34.0, commit 8d469d0 completely changes how makedepend.SH interacts with Makefile.SH, meaning that it's not a drop-in upgrade.
1 parent fe94940 commit d40d6ec

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Porting/bisect-runner.pl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ =head1 OPTIONS
825825
--gold
826826
827827
Revision to use when checking out known-good recent versions of files,
828-
such as F<makedepend.SH>. F<bisect-runner.pl> defaults this to I<blead>,
828+
such as F<hints/freebsd.sh>. F<bisect-runner.pl> defaults this to I<blead>,
829829
but F<bisect.pl> will default it to the most recent stable release.
830830
831831
=item *
@@ -2903,7 +2903,12 @@ sub patch_SH {
29032903
# If you do this, you may need to add in code to correct the output of older
29042904
# makedepends, which don't correctly filter newer gcc output such as
29052905
# <built-in>
2906-
checkout_file('makedepend.SH');
2906+
2907+
# It's the same version in v5.26.0 to v5.34.0
2908+
# Post v5.34.0, commit 8d469d0ecbd06a99 completely changes how makedepend.SH
2909+
# interacts with Makefile.SH, meaning that it's not a drop-in upgrade.
2910+
checkout_file('makedepend.SH', 'v5.34.0')
2911+
if $major < 26;
29072912
29082913
if ($major < 4 && -f 'config.sh'
29092914
&& !extract_from_file('config.sh', qr/^trnl=/)) {

0 commit comments

Comments
 (0)