In perl.git, the branch maint-5.20 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/95ddda1e924ba5f53a7ea5c3c75e571d20969d5d?hp=f81a803b35dc23d80d1e9a79416a10590c25b828>
- Log ----------------------------------------------------------------- commit 95ddda1e924ba5f53a7ea5c3c75e571d20969d5d Author: Jarkko Hietaniemi <[email protected]> Date: Thu Jul 24 20:20:56 2014 -0400 Make PERL_GLOBAL_STRUCT_PRIVATE visible in -V. (cherry picked from commit 59dba841c4c022b197056ed7c78ea7d9e7fbb467) M perl.h commit 5a1814b7e872d9c5195e7b69c1c4a22e7794841d Author: H.Merijn Brand <[email protected]> Date: Sat Jul 26 21:43:54 2014 +0200 Simplify cppsym dash problem (cherry picked from commit 47ef2f80a353917e46d5ef248320c351162a97b2) M Configure commit daf1fb2b37012f7b0e1eb6de3ac373de5e1afcef Author: Brian Fraser <[email protected]> Date: Fri Jul 25 19:46:41 2014 +0200 Configure: Handle hyphens when searching cpp symbols This is really just for Android, which in Configure is known as linux-android; the hyphen is passes as-is to the preprocessor, which handles it as a minus. So don't do that. (cherry picked from commit ecd78e215c9b4ab3f3ab71b30e76bbead372a84e) M Configure commit 01f498f5ada5e45abda744d64dffb182485fb306 Author: Brian Fraser <[email protected]> Date: Fri Jul 25 19:13:26 2014 +0200 Configure: Discard errors when testing for less -R When we try replacing 'less' with 'less -R', it's possible that less will output errors if the option is not supported; this happens, for example, in busybox's less. (cherry picked from commit a872f748481d44baa8bc0f6eb29659782c96ba7f) M Configure commit cb11e018a6f585cda051748f91006d9c0f2bd4fe Author: Brian Fraser <[email protected]> Date: Fri Jul 25 18:34:03 2014 +0200 t/op/taint.t: Accommodate for systems without an inbuilt echo (android, blackberry) (cherry picked from commit 22636a294deeffb346cc852d77d2b3b68a7615c9) M t/op/taint.t commit 7d621c156b0739063624f7a332b9b99b7c2d92f9 Author: Brian Fraser <[email protected]> Date: Thu Jul 31 08:24:01 2014 +0100 Makefile.SH: Add missing files for make test on cross builds (cherry picked from commit ef4ead6db594965224805417f6959ee430d5c928) M Makefile.SH commit cc0d35996109dfbfca4e3c66e557123f16c2f7cd Author: Brian Fraser <[email protected]> Date: Thu Jul 24 15:53:52 2014 +0200 Makefile.SH: Fix cross builds with -Uhostgenerate (cherry picked from commit 329865d81730328189992f6157dd4605d5c23f8e) M Makefile.SH commit ebb18081f4af68564133ac43d9595bd02dfa7e56 Author: Andy Dougherty <[email protected]> Date: Fri Jul 25 13:55:32 2014 -0400 Only use setenv() on Solaris if it is available. This is a followup to 07ad9e0e19891ec129e1a78e40a66ca19b51302d. util.c:Perl_my_setenv() unconditionally used setenv() if #defined(__sun). Solaris 8 had neither setenv() nor unsetenv(), so it failed. Configure does not currently check for setenv(), but the check for unsetenv() is sufficient here since Solaris 9 and later have both. (cherry picked from commit 235c1d5fb08d2f9bf82de88220390de5210ac392) M util.c commit 3b57fc031ad917da3f1c7c68ba0e0cf8bd5dccc5 Author: Tony Cook <[email protected]> Date: Wed Jul 23 17:11:42 2014 +1000 Vladimir Marek is now a perl author (cherry picked from commit bef255a1667a8a05be344c7274d2d9c855493c6d) M AUTHORS commit 116db5b8b1e668f01a57312474ab77f3a71ad5dd Author: Vladimir Marek <[email protected]> Date: Wed Jul 23 17:05:59 2014 +1000 use setenv() on Solaris (cherry picked from commit 07ad9e0e19891ec129e1a78e40a66ca19b51302d) M util.c commit d454072ff6ad1ed4c6920409282feedf61cc643f Author: Alberto Simões <[email protected]> Date: Wed Jul 23 09:44:25 2014 +1000 perlexperiment mentions features a lot, refer to the feature module (cherry picked from commit 2b0121e1c44b6ec834f3c55c427ef006b57c7fff) M pod/perlexperiment.pod ----------------------------------------------------------------------- Summary of changes: AUTHORS | 1 + Configure | 4 ++-- Makefile.SH | 6 +++++- perl.h | 3 +++ pod/perlexperiment.pod | 4 ++++ t/op/taint.t | 4 +++- util.c | 6 +++++- 7 files changed, 23 insertions(+), 5 deletions(-) mode change 100755 => 100644 Makefile.SH diff --git a/AUTHORS b/AUTHORS index 8aed4e2..6073031 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1192,6 +1192,7 @@ Vincent Pit <[email protected]> Vishal Bhatia <[email protected]> Vlad Harchev <[email protected]> Vladimir Alexiev <[email protected]> +Vladimir Marek <[email protected]> Vladimir Timofeev <[email protected]> Volker Schatz <[email protected]> W. Geoffrey Rommel <[email protected]> diff --git a/Configure b/Configure index 4154d7a..af2d6c0 100755 --- a/Configure +++ b/Configure @@ -2518,7 +2518,7 @@ egrep) esac case "$less" in '') ;; -*) if $less -R </dev/null >/dev/null; then +*) if $less -R </dev/null >/dev/null 2>&1; then echo "Substituting less -R for less." less="$less -R" _less=$less @@ -22033,7 +22033,7 @@ XPG3 XPG3_EXTENDED XPG4 XPG4_EXTENDED z8000 EOSH # Maybe put other stuff here too. -cat <<EOSH >>Cppsym.know +./tr '-' '_' <<EOSH >>Cppsym.know $osname EOSH ./tr '[a-z]' '[A-Z]' < Cppsym.know > Cppsym.a diff --git a/Makefile.SH b/Makefile.SH old mode 100755 new mode 100644 index 1135ef7..0840f1c --- a/Makefile.SH +++ b/Makefile.SH @@ -677,7 +677,7 @@ generate_uudmap$(OBJ_EXT): mg_raw.h # it on the target system if we're cross-compiling. # If it is defined, then we just run it locally. case "$hostgenerate" in -'') +''|'undef') $spitshell >>$Makefile <<!GROK!THIS! bitcount.h: generate_uudmap\$(HOST_EXE_EXT) $run ./generate_uudmap\$(HOST_EXE_EXT) \$(generated_headers) @@ -1432,6 +1432,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE $to cpan/*/t $to dist/*/t $to ext/*/t + $to cpan/Archive-Tar/* $to cpan/Term-Cap/test.pl $to cpan/Pod-Usage/* $to cpan/Pod-Parser/* @@ -1457,6 +1458,9 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE $to *.h # --- For t/x2p/s2p.t $to x2p +# --- For t/porting/customized.t + $to vutil.c + $to vxs.inc # --- For t/TEST $to config.sh # --- For lib/diagnostics.t with -Duseshrplib diff --git a/perl.h b/perl.h index 961216b..b7d0d37 100644 --- a/perl.h +++ b/perl.h @@ -4631,6 +4631,9 @@ EXTCONST char PL_bincompat_options[] = # ifdef PERL_GLOBAL_STRUCT " PERL_GLOBAL_STRUCT" # endif +# ifdef PERL_GLOBAL_STRUCT_PRIVATE + " PERL_GLOBAL_STRUCT_PRIVATE" +# endif # ifdef PERL_IMPLICIT_CONTEXT " PERL_IMPLICIT_CONTEXT" # endif diff --git a/pod/perlexperiment.pod b/pod/perlexperiment.pod index 50b1a2a..66bd960 100644 --- a/pod/perlexperiment.pod +++ b/pod/perlexperiment.pod @@ -271,6 +271,10 @@ Removed in: 5.11.3 =back +=head1 SEE ALSO + +For a complete list of features check L<feature>. + =head1 AUTHORS brian d foy C<< <[email protected]> >> diff --git a/t/op/taint.t b/t/op/taint.t index aaf556a..806208a 100644 --- a/t/op/taint.t +++ b/t/op/taint.t @@ -182,7 +182,9 @@ my $TEST = 'TEST'; local $ENV{PATH} = $tmp; is(eval { `$echo 1` }, undef); - like($@, qr/^Insecure directory in \$ENV\{PATH}/); + # Message can be different depending on whether echo + # is a builtin or not + like($@, qr/^Insecure (?:directory in )?\$ENV\{PATH}/); } SKIP: { diff --git a/util.c b/util.c index 4d28e36..2bb4a97 100644 --- a/util.c +++ b/util.c @@ -2039,7 +2039,11 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val) my_setenv_format(environ[i], nam, nlen, val, vlen); } else { # endif -# if defined(__CYGWIN__)|| defined(__SYMBIAN32__) || defined(__riscos__) + /* This next branch should only be called #if defined(HAS_SETENV), but + Configure doesn't test for that yet. For Solaris, setenv() and unsetenv() + were introduced in Solaris 9, so testing for HAS UNSETENV is sufficient. + */ +# if defined(__CYGWIN__)|| defined(__SYMBIAN32__) || defined(__riscos__) || (defined(__sun) && defined(HAS_UNSETENV)) # if defined(HAS_UNSETENV) if (val == NULL) { (void)unsetenv(nam); -- Perl5 Master Repository
