Skip to content

Commit 9689640

Browse files
committed
Config release 6.23
-more common keys for CPAN Testers -fixed XSConfig.t to work with newer Test::More based off Test2 -fixed genkeys.PL tool generated randomly trailing space at the end of each qw() line. Now there will be no extra trailing whitespace on those lines. -fixed Config_xs.PL to read %Config keys from perl distros using Portable.pm
1 parent bf97348 commit 9689640

File tree

8 files changed

+4847
-4637
lines changed

8 files changed

+4847
-4637
lines changed

Changes

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,15 @@ Revision history for XSConfig
99
See cperl#286
1010
-dont regen canned gperf hash when in core/cperl
1111
-fixed XSConfig.t to work with newer Test::More based off Test2
12+
-more common keys for CPAN Testers
13+
-fixed XSConfig.t to work with newer Test::More based off Test2
14+
-fixed genkeys.PL tool generated randomly trailing space at the end of
15+
each qw() line. Now there will be no extra trailing whitespace on those
16+
lines.
17+
-fixed Config_xs.PL to read %Config keys from perl distros using
18+
Portable.pm
1219

13-
6.22 2016-09-10 21:06:56 rurban
20+
6.22 2016-09-10 21:06:56 rurban (never released)
1421
-protect sv in END during global destruction, esp. with B::C
1522
-fixes for no . in @INC (cperl or -Dfortify_inc)
1623

Config_mini.pl.PL

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#usage: perl Config_mini.pl.PL [ignored]
44

55
use strict ;
6-
my $VERSION = '6.22';
6+
my $VERSION = '6.23';
77
use ExtUtils::Command;
88

99
my $mini = searchdirs('Config_mini.pl', \@INC);

Config_xs.PL

+74-34
Original file line numberDiff line numberDiff line change
@@ -177,44 +177,59 @@ useversionedarchname
177177
unless ($in_core) { # cperl doesn't need these, CPAN does
178178
push @cannedkeys , qw(
179179
180-
ARCH BuiltWithPatchPerl Mcc PERL_PATCHLEVEL ccflags_nolargefiles
181-
charbits config_heavy d_acosh d_asctime64 d_asinh d_atanh d_attribut
182-
d_attribute_deprecated d_attribute_format d_attribute_malloc
183-
d_attribute_nonnull d_attribute_noreturn d_attribute_pure
184-
d_attribute_unused d_attribute_warn_unused_result d_backtrace
185-
d_builtin_arith_overflow d_builtin_choose_expr d_builtin_expect
186-
d_c99_variadic_macros d_cbrt d_clearenv d_copysign d_cplusplus d_ctermid
187-
d_ctime64 d_difftime64 d_dir_dd_fd d_dladdr d_duplocale d_erf d_erfc
188-
d_exp2 d_expm1 d_fdclose d_fdim d_fegetround d_fma d_fmax d_fmin
189-
d_fp_classify d_fp_classl d_fpgetround d_freelocale d_fs_data_s
190-
d_fstatfs d_fstatvfs d_futimes d_gdbm_ndbm_h_uses_prototypes
191-
d_gdbmndbm_h_uses_prototypes d_getaddrinfo d_getfsstat d_getmnt
192-
d_getmntent d_getnameinfo d_gmtime64 d_hasmntopt d_hypot d_ilogb
193-
d_inc_version_list d_inetntop d_inetpton d_ip_mreq d_ip_mreq_source
194-
d_ipv6_mreq d_ipv6_mreq_source d_isblank d_isfinitel d_isinfl d_isless
195-
d_isnormal d_j0 d_j0l d_lc_monetary_2008 d_ldexpl d_lgamma
196-
d_lgamma_r d_libname_unique d_llrint d_llrintl d_llround d_llroundl
197-
d_localtime64 d_localtime_r_needs_tzset d_log1p d_log2 d_logb d_lrint
198-
d_lrintl d_lround d_lroundl d_malloc_good_size d_malloc_size
199-
d_memmem d_mktime64 d_modfl_pow32_bug d_modflproto d_nan d_ndbm
200-
d_ndbm_h_uses_prototypes d_nearbyint d_newlocale d_nextafter d_nexttoward
201-
d_nv_zero_is_allbits_zero d_prctl d_prctl_set_name d_printf_format_null
202-
d_pseudofork d_ptrdiff_t d_regcomp d_remainder d_remquo d_rint d_round
203-
d_scalbn d_sfio d_siginfo_si_addr d_siginfo_si_band d_siginfo_si_errno
180+
ARCH BuiltWithPatchPerl Mcc PERL_PATCHLEVEL ansi2knr
181+
ccflags_nolargefiles charbits config_heavy d_accept4 d_acosh
182+
d_asctime64 d_asinh d_atanh d_attribut d_attribute_deprecated
183+
d_attribute_format d_attribute_malloc d_attribute_nonnull
184+
d_attribute_noreturn d_attribute_pure d_attribute_unused
185+
d_attribute_warn_unused_result d_backtrace d_bcmp d_bcopy
186+
d_builtin_add_overflow d_builtin_arith_overflow d_builtin_choose_expr
187+
d_builtin_expect d_builtin_mul_overflow d_builtin_sub_overflow d_bzero
188+
d_c99_variadic_macros d_cbrt d_charvspr d_clearenv d_copysign d_cplusplus
189+
d_ctermid d_ctime64 d_difftime64 d_dir_dd_fd d_dladdr
190+
d_double_has_inf d_double_has_nan d_double_has_negative_zero
191+
d_double_has_subnormals d_double_style_cray d_double_style_ibm
192+
d_double_style_ieee d_double_style_vax d_dup3 d_duplocale d_erf d_erfc
193+
d_exp2 d_expm1 d_fchmodat d_fdclose d_fdim d_fegetround d_fma d_fmax
194+
d_fmin d_fp_classify d_fp_classl d_fpgetround d_freelocale d_fs_data_s
195+
d_fstatfs d_fstatvfs d_futimes d_gai_strerror
196+
d_gdbm_ndbm_h_uses_prototypes d_gdbmndbm_h_uses_prototypes d_getaddrinfo
197+
d_getfsstat d_getmnt d_getmntent d_getnameinfo d_gmtime64 d_hasmntopt
198+
d_hypot d_ilogb d_inc_version_list d_inetntop d_inetpton d_ip_mreq
199+
d_ip_mreq_source d_ipv6_mreq d_ipv6_mreq_source d_isblank d_isfinitel
200+
d_isinfl d_isless d_isnormal d_j0 d_j0l d_lc_monetary_2008
201+
d_ldexpl d_lgamma d_lgamma_r d_libname_unique d_linkat d_llrint
202+
d_llrintl d_llround d_llroundl d_localeconv_l d_localtime64
203+
d_localtime_r_needs_tzset d_log1p d_log2 d_logb d_long_double_style_ieee
204+
d_long_double_style_ieee_doubledouble d_long_double_style_ieee_extended
205+
d_long_double_style_ieee_std d_long_double_style_vax d_lrint d_lrintl
206+
d_lround d_lroundl d_malloc_good_size d_malloc_size d_mbrlen
207+
d_mbrtowc d_memchr d_memcmp d_memcpy d_memmem d_memmove
208+
d_memrchr d_memset d_mkostemp d_mktime64 d_modfl_pow32_bug
209+
d_modflproto d_nan d_nanosleep d_ndbm d_ndbm_h_uses_prototypes
210+
d_nearbyint d_newlocale d_nextafter d_nexttoward d_nv_zero_is_allbits_zero
211+
d_openat d_pipe2 d_prctl d_prctl_set_name d_printf_format_null
212+
d_pseudofork d_ptrdiff_t d_querylocale d_regcomp d_remainder d_remquo
213+
d_renameat d_rint d_round d_safebcpy d_safemcpy d_sanemcmp d_scalbn
214+
d_sfio d_siginfo_si_addr d_siginfo_si_band d_siginfo_si_errno
204215
d_siginfo_si_fd d_siginfo_si_pid d_siginfo_si_status d_siginfo_si_uid
205216
d_siginfo_si_value d_signbit d_sin6_scope_id d_sitearch d_snprintf
206217
d_sockaddr_in6 d_sockaddr_sa_len d_sprintf_returns_strlen d_stat
207-
d_statfs_f_flags d_statfs_s d_static_inline d_statvfs d_strlcat
208-
d_strlcpy d_tgamma d_timegm d_trunc d_truncl d_unsetenv d_uselocale
209-
d_ustat d_vendorscript d_vms_case_sensitive_symbols d_vsnprintf d_wcscmp
210-
d_wcsxfrm defvoidused dl_so_eq_ext doop_cflags doubleinfbytes doublekind
211-
doublemantbits doublenanbytes dtrace extern_C found_libucb from
212-
gccansipedantic git_branch git_commit_id git_commit_id_title git_describe
218+
d_statfs_f_flags d_statfs_s d_static_inline d_statvfs d_strchr
219+
d_strctcpy d_strerrm d_strerror d_strerror_l d_strlcat d_strlcpy
220+
d_strnlen d_strtod_l d_strtold_l d_tgamma d_thread_safe_nl_langinfo_l
221+
d_timegm d_trunc d_truncl d_unlinkat d_unsetenv d_uselocale d_ustat
222+
d_vendorscript d_vms_case_sensitive_symbols d_volatile d_vprintf
223+
d_vsnprintf d_wcscmp d_wcsxfrm default_inc_excludes_dot defvoidused
224+
dl_so_eq_ext doop_cflags doubleinfbytes doublekind doublemantbits
225+
doublenanbytes dtrace extern_C found_libucb from gccansipedantic
226+
git_branch git_commit_id git_commit_id_title git_describe
213227
git_uncommitted_changes gnulibc_version hash_func html1dir html1direxp
214-
html3dir html3direxp i_assert i_bfd i_dld i_execinfo i_fenv
215-
i_gdbm_ndbm i_gdbmndbm i_mallocmalloc i_mntent i_quadmath i_sfio
216-
i_stdbool i_stdint i_sysmount i_syspoll i_sysstatfs i_sysstatvfs
217-
i_sysvfs i_ustat i_xlocale ieeefp_h initialinstalllocation
228+
html3dir html3direxp i_assert i_bfd i_dld i_execinfo i_fenv i_float
229+
i_gdbm_ndbm i_gdbmndbm i_mallocmalloc i_math i_memory i_mntent
230+
i_quadmath i_sfio i_stdarg i_stdbool i_stddef i_stdint i_sysmount
231+
i_syspoll i_sysstatfs i_sysstatvfs i_sysvfs i_ustat i_values
232+
i_varargs i_varhdr i_wchar i_xlocale ieeefp_h initialinstalllocation
218233
installhtml1dir installhtml3dir installsitehtml1dir installsitehtml3dir
219234
installsiteman1dir installsiteman3dir installsitescript
220235
installvendorhtml1dir installvendorhtml3dir installvendorman1dir
@@ -265,6 +280,31 @@ if(defined &ActivePerl::PRODUCT && ! $ENV{ACTIVEPERL_CONFIG_DISABLE}){
265280
);
266281
}
267282

283+
#Strawberry Perl's Portable.pm in Config.pm means parsing Config_heavy.pl
284+
#gave bad paths in everything like
285+
# Failed test 'cmp PP to XS hashes'
286+
# at t/XSConfig.t line 158.
287+
# Structures begin differing at:
288+
# $got->{installsitebin} = 'C:\sperl\526\perl\site\bin'
289+
# $expected->{installsitebin} = 'C:\strawberry\perl\site\bin'
290+
#fetch runtime computed ones, but this portable perl wont be portable any
291+
#further after XSConfig is installed
292+
if($INC{'Portable.pm'}) {
293+
$h{$_} = $Config{$_} foreach qw (
294+
archlib archlibexp bin binexp incpath installarchlib installbin
295+
installprefix installprefixexp installprivlib installscript
296+
installsitearch installsitebin installsitelib installsitescript
297+
installstyle installvendorarch installvendorbin installvendorlib
298+
installvendorscript ld lddlflags ldflags ldflags_nolargefiles libpth
299+
perlpath prefix prefixexp privlib privlibexp scriptdir scriptdirexp
300+
sitearch sitearchexp sitebin sitebinexp sitelib sitelibexp siteprefix
301+
siteprefixexp sitescript sitescriptexp usrinc vendorarch vendorarchexp
302+
vendorbin vendorbinexp vendorhtml1dir vendorhtml3dir vendorlib
303+
vendorlibexp vendorman1dir vendorman3dir vendorprefix vendorprefixexp
304+
vendorscript vendorscriptexp
305+
);
306+
}
307+
268308
# and now patch the values into Config.xs
269309
open $in, '<', $xsout or die "Error reading '$xsout': $!";
270310
open $xs, '>', $xstarg or die "Error writing '$xstarg': $!";

0 commit comments

Comments
 (0)