Skip to content

Commit d95320e

Browse files
committed
make the db header files rw in the build process
A band-aid solution until StrawberryPerl/build-extlibs#49 is fixed
1 parent 8827178 commit d95320e

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

lib/Perl/Dist/Strawberry/Step/FilesAndDirs.pm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ sub _do_job {
171171
$self->boss->message(4, "gonna smartmove '$src' >> '$dst'");
172172
File::Copy::Recursive::rmove_glob($src, $dst) or warn "rmove_glob failed [$src]>[$dst]: $!"; #just warn when wildcard has no match
173173
}
174+
elsif ($cmd eq 'make_rw') {
175+
my ($src) = ($self->boss->resolve_name($args->[0]));
176+
$self->boss->message(4, "gonna make '$src' read-write");
177+
$self->_unset_ro($src);
178+
}
174179
else {
175180
#XXX-TODO
176181
die "FATAL: '$cmd' not implemented";
@@ -189,4 +194,4 @@ sub _check_valid_prefix {
189194
#XXX-TODO implement or remove
190195
}
191196

192-
1;
197+
1;

share/64bit-5.38.0.1.pp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
{ do=>'movefile', args=>[ '<image_dir>/c/lib/libdb-6.1.a', '<image_dir>/c/lib/libdb.a' ] }, #XXX ugly hack
4444
{ do=>'removefile', args=>[ '<image_dir>/c/bin/gccbug', '<image_dir>/c/bin/ld.gold.exe', '<image_dir>/c/bin/ld.bfd.exe' ] },
4545
{ do=>'removefile_recursive', args=>[ '<image_dir>/c', qr/.+\.la$/i ] }, # https://rt.cpan.org/Public/Bug/Display.html?id=127184
46+
{ do=>'make_rw', args=>[ '<image_dir>/c/include/db.h' ] }, # band-aid for ro flag on db headers
47+
{ do=>'make_rw', args=>[ '<image_dir>/c/include/db_cxx.h' ] },
4648
],
4749
},
4850
### NEXT STEP ###########################
@@ -456,6 +458,14 @@
456458
},
457459
},
458460
### NEXT STEP ###########################
461+
{
462+
plugin => 'Perl::Dist::Strawberry::Step::FilesAndDirs',
463+
commands => [
464+
{ do=>'make_rw', args=>[ '<image_dir>/c/include/db.h' ] }, # band-aid for ro flag on db headers
465+
{ do=>'make_rw', args=>[ '<image_dir>/c/include/db_cxx.h' ] },
466+
],
467+
},
468+
### NEXT STEP ###########################
459469
{
460470
disable => $ENV{SKIP_PDL_STEP}, ### hack
461471
plugin => 'Perl::Dist::Strawberry::Step::InstallModules',

0 commit comments

Comments
 (0)