Skip to content

Commit 41d1b93

Browse files
committed
5.38.2.1 config file
Update Socket6 to latest patches Revert to 5.32 patch utility, try patching with --binary.
1 parent 2d0a211 commit 41d1b93

File tree

2 files changed

+527
-2
lines changed

2 files changed

+527
-2
lines changed

lib/Perl/Dist/Strawberry/Step.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ sub _patch_file {
291291
$self->boss->message(5, "PATCHING '$new' '$dst' '$dir' $tt_vars " . ($no_backup||'') . "\n");
292292

293293
if ($dst =~ /\*$/) {
294-
warn "WE IS PATCHIN '$new'";
294+
warn "WE ARE PATCHIN '$new'";
295295
}
296296
if ($new eq 'config_H.gc' and ref($dst) =~ /HASH/) {
297297
$self->boss->message(5, "_patch_file: using hash of values to update config_H.gc'\n");
@@ -324,7 +324,7 @@ if ($dst =~ /\*$/) {
324324
#$self->_apply_patch($dir, $new);
325325
{
326326
my $wd = $self->_push_dir($dir);
327-
system("patch -i $new -p1") == 0 or die "patch '$new' FAILED";
327+
system("patch --binary -i $new -p1") == 0 or die "patch '$new' FAILED";
328328
}
329329
}
330330
elsif ($new =~ /\.(diff|patch)$/) {

0 commit comments

Comments
 (0)