Skip to content

Commit 16a078e

Browse files
committed
Update config libpth vars for 5.36.1 and 5.38.0
And some unrelated cleaning of the 5.38 config. Updates #107
1 parent b0c242d commit 16a078e

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

share/64bit-5.36.1.1.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@
430430
{ do=>'removefile', args=>[ '<image_dir>/README.txt', '<image_dir>/perl2.reloc.txt', '<image_dir>/perl1.reloc.txt', '<image_dir>/relocation.txt',
431431
'<image_dir>/update_env.pl.bat', '<image_dir>/relocation.pl.bat' ] },
432432
{ do=>'createdir', args=>[ '<image_dir>/data' ] },
433-
{ do=>'apply_tt', args=>[ '<dist_sharedir>/portable/portable.perl.tt', '<image_dir>/portable.perl', {gcchost=>'x86_64-w64-mingw32', gccver=>'8.3.0'} ] },
433+
{ do=>'apply_tt', args=>[ '<dist_sharedir>/portable/portable.perl.tt', '<image_dir>/portable.perl', {gcchost=>'x86_64-w64-mingw32', gccver=>'13.1.0'} ] },
434434
{ do=>'copyfile', args=>[ '<dist_sharedir>/portable/portableshell.bat', '<image_dir>/portableshell.bat' ] },
435435
{ do=>'apply_tt', args=>[ '<dist_sharedir>/portable/README.portable.txt.tt', '<image_dir>/README.txt' ] },
436436
# cleanup cpanm related files

share/64bit-5.38.0.1.pp

+1-8
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,15 @@
5555
patch => { #DST paths are relative to the perl src root
5656
'<dist_sharedir>/msi/files/perlexe.ico' => 'win32/perlexe.ico',
5757
'<dist_sharedir>/perl-5.36/perlexe.rc.tt' => 'win32/perlexe.rc',
58-
#'<dist_sharedir>/perl-5.36/perl_pr19663.diff' => '*',
59-
#'<dist_sharedir>/perl-5.36/rt142390.patch' => '*',
60-
#'<dist_sharedir>/perl-5.36/perl_pr20008.diff' => '*',
61-
#'<dist_sharedir>/perl-5.36/perl_pr20136.patch' => '*',
62-
#'<dist_sharedir>/perl-5.36/perl_pr19912_commit1.patch' => '*',
6358
'config_H.gc' => {
6459
I_DBM => 'define',
6560
I_GDBM => 'define',
6661
I_NDBM => 'define',
67-
#HAS_BUILTIN_EXPECT => 'define',
6862
HAS_BUILTIN_CHOOSE_EXPR => 'define',
6963
HAS_SYMLINK => 'define',
7064
},
7165
'config.gc' => { # see Step.pm for list of default updates
7266
d_builtin_choose_expr => 'define',
73-
#d_builtin_expect => 'define',
7467
d_mkstemp => 'define',
7568
d_ndbm => 'define',
7669
d_symlink => 'define', # many cpan modules fail tests when defined
@@ -431,7 +424,7 @@
431424
{ do=>'removefile', args=>[ '<image_dir>/README.txt', '<image_dir>/perl2.reloc.txt', '<image_dir>/perl1.reloc.txt', '<image_dir>/relocation.txt',
432425
'<image_dir>/update_env.pl.bat', '<image_dir>/relocation.pl.bat' ] },
433426
{ do=>'createdir', args=>[ '<image_dir>/data' ] },
434-
{ do=>'apply_tt', args=>[ '<dist_sharedir>/portable/portable.perl.tt', '<image_dir>/portable.perl', {gcchost=>'x86_64-w64-mingw32', gccver=>'8.3.0'} ] },
427+
{ do=>'apply_tt', args=>[ '<dist_sharedir>/portable/portable.perl.tt', '<image_dir>/portable.perl', {gcchost=>'x86_64-w64-mingw32', gccver=>'13.1.0'} ] },
435428
{ do=>'copyfile', args=>[ '<dist_sharedir>/portable/portableshell.bat', '<image_dir>/portableshell.bat' ] },
436429
{ do=>'apply_tt', args=>[ '<dist_sharedir>/portable/README.portable.txt.tt', '<image_dir>/README.txt' ] },
437430
# cleanup cpanm related files

0 commit comments

Comments
 (0)