In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/ef55c6737a667b6853720247c181a0cbfbbe6116?hp=3ecb55dd84519230479575c3898a0895dd4ba286>
- Log ----------------------------------------------------------------- commit ef55c6737a667b6853720247c181a0cbfbbe6116 Author: Aaron Crane <a...@cpan.org> Date: Thu Jun 2 19:11:12 2016 +0100 Add Configure probe for strerror_l() As requested by khw++ Until the relevant symbol is used, HAS_STRERROR_L must be mentioned explicitly in metaconfig.h. This corresponds to metaconfig d0838744f03cfe7642950ea91dd48f575d0bfd15. M Configure M Cross/config.sh-arm-linux M NetWare/config.wc M Porting/config.sh M config_h.SH M configure.com M metaconfig.h M plan9/config_sh.sample M symbian/config.sh M uconfig.h M uconfig.sh M uconfig64.sh M win32/config.ce M win32/config.gc M win32/config.vc commit bc900e45a4498affce40e6fdd0282f3715c0b5be Author: Aaron Crane <a...@cpan.org> Date: Thu Jun 2 19:04:49 2016 +0100 Add Configure probe for querylocale() As requested by khw++ Until the relevant symbol is used, HAS_QUERYLOCALE must be mentioned explicitly in metaconfig.h. This corresponds to metaconfig 541f0dd272df4f9326996727898393ac8f6626f7. M Configure M Cross/config.sh-arm-linux M NetWare/config.wc M Porting/config.sh M config_h.SH M configure.com M metaconfig.h M plan9/config_sh.sample M symbian/config.sh M uconfig.h M uconfig.sh M uconfig64.sh M win32/config.ce M win32/config.gc M win32/config.vc commit bd4dc8873aedf5144874edd7e1cf73988fb50bde Author: Aaron Crane <a...@cpan.org> Date: Thu Jun 2 18:56:02 2016 +0100 Rebuild Configure from current metaconfig Relevant changes: commit 5d3ffa97290d2d3d65a42a0ed8b69d945b661ee7 Author: H.Merijn Brand - Tux <h.m.br...@xs4all.nl> Date: Sun May 29 15:30:33 2016 +0200 Finish.U isn't modified anymore All changes accepted by upstream. One down, 164 to go commit 5d805d83bd4663831594540ddadeeb6213d19736 Author: H.Merijn Brand - Tux <h.m.br...@xs4all.nl> Date: Sat May 14 18:48:26 2016 +0200 Remove trailing whitespace on meta-lines in unit files This change has also been proposed as PR to dist upstream commit b9807b5fe3f4c97fa34e19b8a9b265f91f0e4aca Author: H.Merijn Brand - Tux <h.m.br...@xs4all.nl> Date: Sat May 14 18:30:03 2016 +0200 Merged changes to Finish.U M Configure M config_h.SH ----------------------------------------------------------------------- Summary of changes: Configure | 20 +++++++++++++++----- Cross/config.sh-arm-linux | 2 ++ NetWare/config.wc | 2 ++ Porting/config.sh | 2 ++ config_h.SH | 18 +++++++++++++++--- configure.com | 2 ++ metaconfig.h | 2 ++ plan9/config_sh.sample | 2 ++ symbian/config.sh | 2 ++ uconfig.h | 22 +++++++++++++++++----- uconfig.sh | 2 ++ uconfig64.sh | 2 ++ win32/config.ce | 2 ++ win32/config.gc | 2 ++ win32/config.vc | 2 ++ 15 files changed, 71 insertions(+), 13 deletions(-) diff --git a/Configure b/Configure index 1cd411a..2b2cd07 100755 --- a/Configure +++ b/Configure @@ -681,6 +681,7 @@ d_nearbyint='' d_duplocale='' d_freelocale='' d_newlocale='' +d_querylocale='' d_uselocale='' i_xlocale='' d_nextafter='' @@ -861,6 +862,7 @@ d_strerrm='' d_strerror='' d_sysernlst='' d_syserrlst='' +d_strerror_l='' d_strerror_r='' strerror_r_proto='' d_strftime='' @@ -14149,6 +14151,10 @@ eval $inlibc 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 @@ -19275,6 +19281,10 @@ if test "X$d_strerror" = X -o "X$d_syserrlst" = X; then fi fi +: see if strerror_l exists +set strerror_l d_strerror_l +eval $inlibc + : see if strerror_r exists set strerror_r d_strerror_r eval $inlibc @@ -24518,6 +24528,7 @@ d_pwpasswd='$d_pwpasswd' d_pwquota='$d_pwquota' d_qgcvt='$d_qgcvt' d_quad='$d_quad' +d_querylocale='$d_querylocale' d_random_r='$d_random_r' d_re_comp='$d_re_comp' d_readdir64_r='$d_readdir64_r' @@ -24637,6 +24648,7 @@ d_strcoll='$d_strcoll' d_strctcpy='$d_strctcpy' d_strerrm='$d_strerrm' d_strerror='$d_strerror' +d_strerror_l='$d_strerror_l' d_strerror_r='$d_strerror_r' d_strftime='$d_strftime' d_strlcat='$d_strlcat' @@ -25316,8 +25328,7 @@ Id='$Id' : Finish up by extracting the .SH files case "$alldone" in exit) - $rm -rf UU - echo "Extraction done." + echo "Stopping at your request, leaving temporary files around." exit 0 ;; cont) @@ -25392,11 +25403,10 @@ the policy defaults. EOM fi -if $test -f config.msg; then +if $test -f UU/config.msg; then echo "Hmm. I also noted the following information while running:" echo " " - $cat config.msg >&4 - $rm -f config.msg + $cat UU/config.msg >&4 fi $rm -f kit*isdone ark*isdone $rm -rf UU diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 463bf54..ba0eabf 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -432,6 +432,7 @@ d_pwpasswd='define' d_pwquota='undef' d_qgcvt='define' d_quad='define' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -548,6 +549,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='define' d_strlcat='undef' diff --git a/NetWare/config.wc b/NetWare/config.wc index a06d89c..7ae8d4f 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -421,6 +421,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='undef' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -538,6 +539,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='define' d_strlcat='undef' diff --git a/Porting/config.sh b/Porting/config.sh index 6ce6e82..df96265 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -442,6 +442,7 @@ d_pwpasswd='define' d_pwquota='undef' d_qgcvt='undef' d_quad='define' +d_querylocale='undef' d_random_r='undef' d_re_comp='undef' d_readdir64_r='undef' @@ -561,6 +562,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='define' d_strlcat='define' diff --git a/config_h.SH b/config_h.SH index 40b3475..6e8cd3b 100755 --- a/config_h.SH +++ b/config_h.SH @@ -217,7 +217,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #$d_getlogin HAS_GETLOGIN /**/ /* HAS_GETPGID: - * This symbol, if defined, indicates to the C program that + * This symbol, if defined, indicates to the C program that * the getpgid(pid) function is available to get the * process group id. */ @@ -676,8 +676,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * This symbol holds the type used for the second argument to * getgroups() and setgroups(). Usually, this is the same as * gidtype (gid_t) , but sometimes it isn't. - * It can be int, ushort, gid_t, etc... - * It may be necessary to include <sys/types.h> to get any + * It can be int, ushort, gid_t, etc... + * It may be necessary to include <sys/types.h> to get any * typedef'ed information. This is only required if you have * getgroups() or setgroups().. */ @@ -3246,9 +3246,14 @@ 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_QUERYLOCALE: + * This symbol, if defined, indicates that the querylocale routine is + * available to return the name of the locale for a category mask. + */ #$d_newlocale HAS_NEWLOCALE /**/ #$d_freelocale HAS_FREELOCALE /**/ #$d_uselocale HAS_USELOCALE /**/ +#$d_querylocale HAS_QUERYLOCALE /**/ /* HAS_NEXTAFTER: * This symbol, if defined, indicates that the nextafter routine is @@ -3502,6 +3507,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un */ #$d_fstatvfs HAS_FSTATVFS /**/ +/* HAS_STRERROR_L: + * This symbol, if defined, indicates that the strerror_l routine is + * available to return the error message for a given errno value in + * a particular locale (identified by a locale_t object). + */ +#$d_strerror_l HAS_STRERROR_L /**/ + /* HAS_STRFTIME: * This symbol, if defined, indicates that the strftime routine is * available to do time formatting. diff --git a/configure.com b/configure.com index ffcbc22..f7d002e 100644 --- a/configure.com +++ b/configure.com @@ -6893,6 +6893,7 @@ $ WC "d_lgamma_r='undef'" $ WC "d_localtime_r='undef'" ! leave undef'd; we use my_localtime $ WC "d_localtime_r_needs_tzset='undef'" $ WC "d_newlocale='undef'" +$ WC "d_querylocale='undef'" $ WC "d_random_r='undef'" $ WC "d_readdir_r='define'" ! always defined; we roll our own $ WC "d_readdir64_r='undef'" @@ -6906,6 +6907,7 @@ $ WC "d_setservent_r='undef'" $ WC "d_snprintf='" + d_snprintf + "'" $ WC "d_srand48_r='undef'" $ WC "d_srandom_r='undef'" +$ WC "d_strerror_l='undef'" $ WC "d_strerror_r='undef'" $ WC "d_tmpnam_r='undef'" $ WC "d_ttyname_r='" + d_ttyname_r + "'" diff --git a/metaconfig.h b/metaconfig.h index 84580f5..94aae84 100644 --- a/metaconfig.h +++ b/metaconfig.h @@ -31,6 +31,8 @@ * HAS_NEWLOCALE * HAS_PRCTL * HAS_PSEUDOFORK + * HAS_QUERYLOCALE + * HAS_STRERROR_L * HAS_TIMEGM * HAS_USELOCALE * I16SIZE diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index 8e5cae3..4171745 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -432,6 +432,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='define' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -548,6 +549,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='define' d_strlcat='undef' diff --git a/symbian/config.sh b/symbian/config.sh index 48cb7a5..103a88b 100644 --- a/symbian/config.sh +++ b/symbian/config.sh @@ -378,6 +378,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='undef' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -496,6 +497,7 @@ d_strcoll='undef' d_strctcpy='undef' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='undef' d_strlcat='undef' diff --git a/uconfig.h b/uconfig.h index ce0d81b..9c008fe 100644 --- a/uconfig.h +++ b/uconfig.h @@ -182,7 +182,7 @@ /*#define HAS_GETLOGIN / **/ /* HAS_GETPGID: - * This symbol, if defined, indicates to the C program that + * This symbol, if defined, indicates to the C program that * the getpgid(pid) function is available to get the * process group id. */ @@ -641,8 +641,8 @@ * This symbol holds the type used for the second argument to * getgroups() and setgroups(). Usually, this is the same as * gidtype (gid_t) , but sometimes it isn't. - * It can be int, ushort, gid_t, etc... - * It may be necessary to include <sys/types.h> to get any + * It can be int, ushort, gid_t, etc... + * It may be necessary to include <sys/types.h> to get any * typedef'ed information. This is only required if you have * getgroups() or setgroups().. */ @@ -3211,9 +3211,14 @@ * This symbol, if defined, indicates that the uselocale routine is * available to set the current locale for the calling thread. */ +/* HAS_QUERYLOCALE: + * This symbol, if defined, indicates that the querylocale routine is + * available to return the name of the locale for a category mask. + */ /*#define HAS_NEWLOCALE / **/ /*#define HAS_FREELOCALE / **/ /*#define HAS_USELOCALE / **/ +/*#define HAS_QUERYLOCALE / **/ /* HAS_NEXTAFTER: * This symbol, if defined, indicates that the nextafter routine is @@ -3467,6 +3472,13 @@ */ /*#define HAS_FSTATVFS / **/ +/* HAS_STRERROR_L: + * This symbol, if defined, indicates that the strerror_l routine is + * available to return the error message for a given errno value in + * a particular locale (identified by a locale_t object). + */ +/*#define HAS_STRERROR_L / **/ + /* HAS_STRFTIME: * This symbol, if defined, indicates that the strftime routine is * available to do time formatting. @@ -5241,6 +5253,6 @@ #endif /* Generated from: - * ce61c4f18e82f6356cdae44c5336ceac1d3253033d7449651927f5633be5c3c2 config_h.SH - * f28cf0c2509cffce1f29866cccd109cee84c941fc63685f0795d25380d47382d uconfig.sh + * c14530f7567d861ce42d42446fc2ee9cd3625763f65867d5f42849c337bbc361 config_h.SH + * 3b14c76342a834042da506e8c3b4269f7d545453079733cb740970ab9cc4294e uconfig.sh * ex: set ro: */ diff --git a/uconfig.sh b/uconfig.sh index f5c230c..c951113 100644 --- a/uconfig.sh +++ b/uconfig.sh @@ -371,6 +371,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='undef' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -487,6 +488,7 @@ d_strcoll='undef' d_strctcpy='undef' d_strerrm='strerror(e)' d_strerror='undef' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='undef' d_strlcat='undef' diff --git a/uconfig64.sh b/uconfig64.sh index c545858..6efaf44 100644 --- a/uconfig64.sh +++ b/uconfig64.sh @@ -372,6 +372,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='define' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -488,6 +489,7 @@ d_strcoll='undef' d_strctcpy='undef' d_strerrm='strerror(e)' d_strerror='undef' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='undef' d_strlcat='undef' diff --git a/win32/config.ce b/win32/config.ce index a5ee737..b37222a 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -419,6 +419,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='undef' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -536,6 +537,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='undef' d_strlcat='undef' diff --git a/win32/config.gc b/win32/config.gc index e9cf4ed..017a5e5 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -420,6 +420,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='define' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -536,6 +537,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='define' d_strlcat='undef' diff --git a/win32/config.vc b/win32/config.vc index 2fc37b0..ddbd133 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -420,6 +420,7 @@ d_pwpasswd='undef' d_pwquota='undef' d_qgcvt='undef' d_quad='define' +d_querylocale='undef' d_random_r='undef' d_readdir64_r='undef' d_readdir='define' @@ -536,6 +537,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strerror_l='undef' d_strerror_r='undef' d_strftime='define' d_strlcat='undef' -- Perl5 Master Repository