Skip to content

Commit 4699841

Browse files
committed
Update 5.36 config for hash based config.gc approach
1 parent 870c1cc commit 4699841

File tree

1 file changed

+80
-3
lines changed

1 file changed

+80
-3
lines changed

share/64bit-5.36.0.1.pp

Lines changed: 80 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
'gcc-license' => '<package_url>/kmx/64_gcctoolchain/mingw64-w64-gcc8.3.0_20190316-lic.zip',
3232
#special cases
3333
'libmysql' => '<package_url>/kmx/64_libs/gcc71-2017Q2/64bit_mysql-5.7.16-bin_20170517.zip',
34-
# gcc10 libs - not all are needed
34+
# gcc10 libs - not all are needed
3535
bzip2 => 'file:///z:/extlib/_out/64bit_bzip2-1.0.6-bin_20230302.zip',
3636
db => 'file:///z:/extlib/_out/64bit_db-6.2.38-bin_20230302.zip',
3737
expat => 'file:///z:/extlib/_out/64bit_expat-2.2.6-bin_20230302.zip',
@@ -106,8 +106,85 @@
106106
'<dist_sharedir>/perl-5.36/perlexe.rc.tt' => 'win32/perlexe.rc',
107107
'<dist_sharedir>/perl-5.36/perl_pr19663.diff' => '*',
108108
'<dist_sharedir>/perl-5.36/rt142390.patch' => '*',
109-
'<dist_sharedir>/perl-5.36/win32_config.gc.diff' => '*',
110-
'<dist_sharedir>/perl-5.36/win32_config_H.gc.diff' => '*',
109+
#'<dist_sharedir>/perl-5.36/win32_config.gc.diff' => '*',
110+
#'<dist_sharedir>/perl-5.36/win32_config_H.gc.diff' => '*',
111+
'config_H.gc' => {
112+
I_DBM => 'define',
113+
I_GDBM => 'define',
114+
I_NDBM => 'define',
115+
HAS_BUILTIN_EXPECT => 'define',
116+
HAS_BUILTIN_CHOOSE_EXPR => 'define',
117+
},
118+
'config.gc' => { # many of these can be defaults
119+
archlib => '~INST_TOP~\lib',
120+
archlibexp => '~INST_TOP~\lib',
121+
bin => '~INST_TOP~\bin',
122+
binexp => '~INST_TOP~\bin',
123+
d_builtin_choose_expr => 'define',
124+
d_builtin_expect => 'define',
125+
d_mkstemp => 'define',
126+
d_ndbm => 'define',
127+
d_vendorarch => 'define',
128+
d_vendorbin => 'define',
129+
d_vendorlib => 'define',
130+
d_vendorscript => 'define',
131+
dlext => 'xs.dll',
132+
i_db => 'define',
133+
i_dbm => 'define',
134+
i_gdbm => 'define',
135+
i_ndbm => 'define',
136+
installarchlib => '~INST_TOP~\lib',
137+
installbin => '~INST_TOP~\bin',
138+
installhtmldir => '',
139+
installhtmlhelpdir => '',
140+
installman1dir => '',
141+
installman3dir => '',
142+
installprefix => '~INST_TOP~',
143+
installprefixexp => '~INST_TOP~',
144+
installprivlib => '~INST_TOP~\lib',
145+
installscript => '~INST_TOP~\bin',
146+
installsitearch => '~INST_TOP~\site\lib',
147+
installsitebin => '~INST_TOP~\site\bin',
148+
installsitelib => '~INST_TOP~\site\lib',
149+
installsitescript => '~INST_TOP~\site\bin',
150+
installvendorarch => '~INST_TOP~\vendor\lib',
151+
installvendorbin => '~INST_TOP~\bin',
152+
installvendorlib => '~INST_TOP~\vendor\lib',
153+
installvendorscript => '~INST_TOP~\bin',
154+
man1dir => '',
155+
man1direxp => '',
156+
man3dir => '',
157+
man3direxp => '',
158+
myuname => 'Win32 strawberry-perl 5.36.0.1 #1 Sat 04 Mar 2023 x64 tempvaluesonly',
159+
osvers => '10',
160+
perlpath => '~INST_TOP~\bin\perl.exe',
161+
privlib => '~INST_TOP~\lib',
162+
privlibexp => '~INST_TOP~\lib',
163+
scriptdir => '~INST_TOP~\bin',
164+
scriptdirexp => '~INST_TOP~\bin',
165+
sitearch => '~INST_TOP~\site\lib',
166+
sitearchexp => '~INST_TOP~\site\lib',
167+
sitebin => '~INST_TOP~\site\bin',
168+
sitebinexp => '~INST_TOP~\site\bin',
169+
sitelib => '~INST_TOP~\site\lib',
170+
sitelibexp => '~INST_TOP~\site\lib',
171+
siteprefix => '~INST_TOP~\site',
172+
siteprefixexp => '~INST_TOP~\site',
173+
sitescript => '~INST_TOP~\site\bin',
174+
sitescriptexp => '~INST_TOP~\site\bin',
175+
usevendorprefix => 'define',
176+
usrinc => 'C:\strawberry\c\include',
177+
vendorarch => '~INST_TOP~\vendor\lib',
178+
vendorarchexp => '~INST_TOP~\vendor\lib',
179+
vendorbin => '~INST_TOP~\bin',
180+
vendorbinexp => '~INST_TOP~\bin',
181+
vendorlib => '~INST_TOP~\vendor\lib',
182+
vendorlibexp => '~INST_TOP~\vendor\lib',
183+
vendorprefix => '~INST_TOP~\vendor',
184+
vendorprefixexp => '~INST_TOP~\vendor',
185+
vendorscript => '~INST_TOP~\bin',
186+
vendorscriptexp => '~INST_TOP~\bin',
187+
},
111188
},
112189
license => { #SRC paths are relative to the perl src root
113190
'Readme' => '<image_dir>/licenses/perl/Readme',

0 commit comments

Comments
 (0)