In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/7b850028ea35536a8baa505b46aa55a5a9599e0d?hp=836bb1e34a8e2f269b0c97fa72d2641e7c775787>
- Log ----------------------------------------------------------------- commit 7b850028ea35536a8baa505b46aa55a5a9599e0d Author: Aaron Crane <[email protected]> Date: Thu Apr 19 15:38:17 2018 +0200 Rebuild Configure using metaconfig langinfo change We are now in sync with perl5-metaconfig/metaconfig@2d3a3017b8d44d778ed765d529ca114924b3ee14 commit 0faf531f63c88379bd22fe7801555d5aef100c5d Author: Aaron Crane <[email protected]> Date: Thu Apr 19 15:07:16 2018 +0200 Rebuild Configure from latest units Most of the change here comes from a single unit being moved in the generated Configure, but there are some substantive changes: - config_h.SH was missing HAS_DUPLOCALE and d_duplocale - d_duplocale was also missing from the platform-specific config-var files This still doesn't quite ensure that rebuilding Configure makes no changes, because there are differences to nl_langinfo() handling that need a change in our metaconfig units. That will come next. ----------------------------------------------------------------------- Summary of changes: Configure | 66 +++++++++++++++++++++--------------------- Cross/config.sh-arm-linux | 1 + Cross/config.sh-arm-linux-n770 | 1 + NetWare/config.wc | 1 + config_h.SH | 5 ++++ plan9/config_sh.sample | 1 + symbian/config.sh | 1 + uconfig.h | 9 ++++-- uconfig.sh | 1 + uconfig64.sh | 1 + win32/config.ce | 1 + win32/config.gc | 1 + win32/config.vc | 1 + 13 files changed, 55 insertions(+), 35 deletions(-) diff --git a/Configure b/Configure index f257910401..4eea1b7a6b 100755 --- a/Configure +++ b/Configure @@ -229,7 +229,7 @@ extensions='' known_extensions='' nonxs_ext='' static_ext='' -usei18n_lang='' +uselanginfo='' useopcode='' useposix='' extras='' @@ -1465,12 +1465,12 @@ ignore_versioned_solibs='' ccname='' ccversion='' perllibs='' -: set usei18n_lang=false in your hint file to disable the I18N_Langinfo extension. -usei18n_lang=true : set useposix=false in your hint file to disable the POSIX extension. useposix=true : set useopcode=false in your hint file to disable the Opcode extension. useopcode=true +: set uselanginfo=false in your hint file to disable the I18N::Langinfo extension. +uselanginfo=true archname64='' ccflags_uselargefiles='' ldflags_uselargefiles='' @@ -12658,6 +12658,30 @@ eval $inlibc set dup3 d_dup3 eval $inlibc +: see if this is an xlocale.h system +set xlocale.h i_xlocale +eval $inhdr + +: see if newlocale exists +set newlocale d_newlocale +eval $inlibc + +: see if freelocale exists +set freelocale d_freelocale +eval $inlibc + +: see if uselocale exists +set uselocale d_uselocale +eval $inlibc + +: see if duplocale exists +set duplocale d_duplocale +eval $inlibc + +: see if querylocale exists +set querylocale d_querylocale +eval $inlibc + : see if eaccess exists set eaccess d_eaccess eval $inlibc @@ -14005,30 +14029,6 @@ $rm_try set d_fpos64_t eval $setvar -: see if this is an xlocale.h system -set xlocale.h i_xlocale -eval $inhdr - -: see if newlocale exists -set newlocale d_newlocale -eval $inlibc - -: see if freelocale exists -set freelocale d_freelocale -eval $inlibc - -: see if uselocale exists -set uselocale d_uselocale -eval $inlibc - -: see if duplocale exists -set duplocale d_duplocale -eval $inlibc - -: see if querylocale exists -set querylocale d_querylocale -eval $inlibc - : see if frexpl exists set frexpl d_frexpl eval $inlibc @@ -23278,11 +23278,6 @@ for xxx in $xs_extensions ; do $define) avail_ext="$avail_ext $xxx" ;; esac ;; - I18N/Langinfo|i18n_lan) - case "$usei18n_lang" in - true|define|y) avail_ext="$avail_ext $xxx" ;; - esac - ;; IPC/SysV|ipc/sysv) : XXX Do we need a useipcsysv variable here case "${d_msg}${d_sem}${d_shm}" in @@ -23336,6 +23331,11 @@ for xxx in $xs_extensions ; do true|$define|y) avail_ext="$avail_ext $xxx" ;; esac ;; + I18N/Langinfo|langinfo) + case "$uselanginfo" in + true|define|y) avail_ext="$avail_ext $xxx" ;; + esac + ;; Sys/Syslog|sys/syslog) case $osname in amigaos) ;; # not really very useful on AmigaOS @@ -24826,9 +24826,9 @@ usedevel='$usedevel' usedl='$usedl' usedtrace='$usedtrace' usefaststdio='$usefaststdio' -usei18n_lang='$i18n_lang' useithreads='$useithreads' usekernprocpathname='$usekernprocpathname' +uselanginfo='$uselanginfo' uselargefiles='$uselargefiles' uselongdouble='$uselongdouble' usemallocwrap='$usemallocwrap' diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 68a165523f..84fbaca425 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -180,6 +180,7 @@ d_drand48_r='undef' d_drand48proto='define' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='define' d_endgrent_r='undef' diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 index de70c74744..cab1857d34 100644 --- a/Cross/config.sh-arm-linux-n770 +++ b/Cross/config.sh-arm-linux-n770 @@ -179,6 +179,7 @@ d_drand48_r='undef' d_drand48proto='define' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='define' d_endgrent_r='undef' diff --git a/NetWare/config.wc b/NetWare/config.wc index dd04bae6f4..3c70161c42 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -167,6 +167,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' diff --git a/config_h.SH b/config_h.SH index 63cb2f753f..da5ee5e019 100755 --- a/config_h.SH +++ b/config_h.SH @@ -3115,6 +3115,10 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * This symbol, if defined, indicates that the uselocale routine is * available to set the current locale for the calling thread. */ +/* HAS_DUPLOCALE: + * This symbol, if defined, indicates that the duplocale routine is + * available to duplicate a locale object. + */ /* HAS_QUERYLOCALE: * This symbol, if defined, indicates that the querylocale routine is * available to return the name of the locale for a category mask. @@ -3126,6 +3130,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #$d_newlocale HAS_NEWLOCALE /**/ #$d_freelocale HAS_FREELOCALE /**/ #$d_uselocale HAS_USELOCALE /**/ +#$d_duplocale HAS_DUPLOCALE /**/ #$d_querylocale HAS_QUERYLOCALE /**/ #$i_xlocale I_XLOCALE /**/ diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index a600b6470f..344613ae0e 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -180,6 +180,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='define' d_endgrent_r='undef' diff --git a/symbian/config.sh b/symbian/config.sh index f672a19ca8..28969c1c48 100644 --- a/symbian/config.sh +++ b/symbian/config.sh @@ -125,6 +125,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='undef' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' diff --git a/uconfig.h b/uconfig.h index 27e35f4236..104553d50d 100644 --- a/uconfig.h +++ b/uconfig.h @@ -3080,6 +3080,10 @@ * This symbol, if defined, indicates that the uselocale routine is * available to set the current locale for the calling thread. */ +/* HAS_DUPLOCALE: + * This symbol, if defined, indicates that the duplocale routine is + * available to duplicate a locale object. + */ /* HAS_QUERYLOCALE: * This symbol, if defined, indicates that the querylocale routine is * available to return the name of the locale for a category mask. @@ -3091,6 +3095,7 @@ /*#define HAS_NEWLOCALE / **/ /*#define HAS_FREELOCALE / **/ /*#define HAS_USELOCALE / **/ +/*#define HAS_DUPLOCALE / **/ /*#define HAS_QUERYLOCALE / **/ /*#define I_XLOCALE / **/ @@ -5219,6 +5224,6 @@ #endif /* Generated from: - * 8047ef9e3b5e75f1f5c3dc1b32b5f65e47d91672c551d49889fe3f1d14345138 config_h.SH - * 1e70064e443c06121c6da3420720d35624194e5ddf48b168a65ff46273c53478 uconfig.sh + * 56a02f6734fb9a0de8f95d1a08f8d4b46182e6b374a276010c43dad6fff17642 config_h.SH + * bf0ec5566c5c2d58c68ec60e41ab6cb78ab48a521e25ff1f0f215ee01caadcfb uconfig.sh * ex: set ro: */ diff --git a/uconfig.sh b/uconfig.sh index e77ac57e33..b44bb772b6 100644 --- a/uconfig.sh +++ b/uconfig.sh @@ -119,6 +119,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='undef' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' diff --git a/uconfig64.sh b/uconfig64.sh index 2acf368b93..e2c420c65c 100644 --- a/uconfig64.sh +++ b/uconfig64.sh @@ -119,6 +119,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='undef' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' diff --git a/win32/config.ce b/win32/config.ce index b9e058ceb4..7a82656c9e 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -165,6 +165,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' diff --git a/win32/config.gc b/win32/config.gc index ee640a10f8..29a88829be 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -167,6 +167,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' diff --git a/win32/config.vc b/win32/config.vc index c1fc92d3ea..5b89e93b0a 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -167,6 +167,7 @@ d_drand48_r='undef' d_drand48proto='undef' d_dup2='define' d_dup3='undef' +d_duplocale='undef' d_eaccess='undef' d_endgrent='undef' d_endgrent_r='undef' -- Perl5 Master Repository
