In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f97a82b4769f9dc8deb2cc1bb6e3dfa3c52e3caa?hp=44195fc344101209b6578cf2a5ffb64c1999971c>
- Log ----------------------------------------------------------------- commit f97a82b4769f9dc8deb2cc1bb6e3dfa3c52e3caa Author: Brian Fraser <[email protected]> Date: Thu Oct 30 16:45:30 2014 +0100 XS::APItest, svpeek.t: Test the correct thing M ext/XS-APItest/APItest.pm M ext/XS-APItest/t/svpeek.t commit 4821216b2814930e7d3a44653772d5e68220b3cc Author: Brian Fraser <[email protected]> Date: Thu Oct 30 14:34:39 2014 +0100 XSLoader: Amend the mod2fname generation to detect more cases M dist/XSLoader/XSLoader_pm.PL commit a7ea4c68ecf61b7634f2df7a4fcaf47e291b0465 Author: Brian Fraser <[email protected]> Date: Thu Oct 30 13:23:05 2014 +0100 POSIX/t/posix.t: Fix skip count for localeless systems M ext/POSIX/t/posix.t commit e6a53dbc5b9b5fca28b08021073558773be25ef6 Author: Brian Fraser <[email protected]> Date: Mon Oct 6 23:34:45 2014 +0200 POSIX: C99 support exceptions on Android M ext/POSIX/POSIX.xs commit 44c4e96d0f2c7bd47f49695c8d7600f07c7d3577 Author: Brian Fraser <[email protected]> Date: Mon Sep 29 20:34:02 2014 +0200 Android hints: No locales here, so undef d_lc_monetary_2008 M hints/linux-android.sh commit f5f6538d1935b7a7b00b4f8d43f2f7169217b3f6 Author: Brian Fraser <[email protected]> Date: Mon Sep 29 20:33:19 2014 +0200 overload.pm: Removed an unused variable M lib/overload.pm ----------------------------------------------------------------------- Summary of changes: dist/XSLoader/XSLoader_pm.PL | 7 +++++-- ext/POSIX/POSIX.xs | 23 +++++++++++++++++++++++ ext/POSIX/t/posix.t | 2 +- ext/XS-APItest/APItest.pm | 2 +- ext/XS-APItest/t/svpeek.t | 3 ++- hints/linux-android.sh | 1 + lib/overload.pm | 4 ++-- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL index 893846a..7a8a638 100644 --- a/dist/XSLoader/XSLoader_pm.PL +++ b/dist/XSLoader/XSLoader_pm.PL @@ -68,11 +68,14 @@ sub load { EOT -print OUT <<'EOT' if defined &DynaLoader::mod2fname; +# defined &DynaLoader::mod2fname catches most cases, except when +# cross-compiling to a system that defines mod2fname. Using +# $Config{d_libname_unique} is a best attempt at catching those cases. +print OUT <<'EOT' if defined &DynaLoader::mod2fname || $Config{d_libname_unique}; # Some systems have restrictions on files names for DLL's etc. # mod2fname returns appropriate file base name (typically truncated) # It may also edit @modparts if required. - $modfname = &mod2fname(\@modparts) if defined &mod2fname; + $modfname = &DynaLoader::mod2fname(\@modparts) if defined &DynaLoader::mod2fname; EOT diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 5f546f5..f89ddf8 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -490,6 +490,29 @@ #endif +/* XXX Regarding C99 math.h, Android seems to be missing these: + + For API level < 13 + nan log2 nexttoward + + For API level < 18 + log2 nexttoward + + See https://android.googlesource.com/platform/development/+/b280e72a97736930063e947fe5fcda7a191e7b10/ndk/platforms/android-9/include/math.h + */ + +#ifdef __ANDROID__ +# include <android/api-level.h> +# if __ANDROID_API__ < 13 +# undef c99_nan +# endif +# if __ANDROID_API__ < 17 +# undef c99_log2 +# undef c99_nexttoward +# endif +#endif + + /* XXX Regarding C99 math.h, VMS seems to be missing these: lround nan nearbyint round scalbn llrint diff --git a/ext/POSIX/t/posix.t b/ext/POSIX/t/posix.t index 18ea0be..9495fcc 100644 --- a/ext/POSIX/t/posix.t +++ b/ext/POSIX/t/posix.t @@ -344,7 +344,7 @@ eval { use strict; POSIX->import("S_ISBLK"); my $x = S_ISBLK }; unlike( $@, qr/Can't use string .* as a symbol ref/, "Can import autoloaded constants" ); SKIP: { - skip("localeconv() not present", 20) unless $Config{d_locconv}; + skip("localeconv() not present", 26) unless $Config{d_locconv}; my $conv = localeconv; is(ref $conv, 'HASH', 'localconv returns a hash reference'); diff --git a/ext/XS-APItest/APItest.pm b/ext/XS-APItest/APItest.pm index bd4a7a8..c9610a7 100644 --- a/ext/XS-APItest/APItest.pm +++ b/ext/XS-APItest/APItest.pm @@ -5,7 +5,7 @@ use strict; use warnings; use Carp; -our $VERSION = '0.67'; +our $VERSION = '0.68'; require XSLoader; diff --git a/ext/XS-APItest/t/svpeek.t b/ext/XS-APItest/t/svpeek.t index 92c03a1..df914fc 100644 --- a/ext/XS-APItest/t/svpeek.t +++ b/ext/XS-APItest/t/svpeek.t @@ -27,7 +27,8 @@ if ($^O eq 'VMS') { } is (DPeek ($|), 'PVMG(1)', '$|'); - "abc" =~ m/(b)/; # Don't know why these magic vars have this content + "abc" =~ m/b/; # Don't know why these magic vars have this content + () = $1 || ''; is (DPeek ($1), 'PVMG()', ' $1'); is (DPeek ($`), 'PVMG()', ' $`'); is (DPeek ($&), 'PVMG()', ' $&'); diff --git a/hints/linux-android.sh b/hints/linux-android.sh index fdfe64a..6a59cb7 100644 --- a/hints/linux-android.sh +++ b/hints/linux-android.sh @@ -35,6 +35,7 @@ libswanted="$libswanted m" d_locconv='undef' d_setlocale='undef' d_setlocale_r='undef' +d_lc_monetary_2008='undef' i_locale='undef' # https://code.google.com/p/android-source-browsing/source/browse/libc/netbsd/net/getservent_r.c?repo=platform--bionic&r=ca6fe7bebe3cc6ed7e2db5a3ede2de0fcddf411d#95 diff --git a/lib/overload.pm b/lib/overload.pm index fc9ff4e..dc37380 100644 --- a/lib/overload.pm +++ b/lib/overload.pm @@ -1,6 +1,6 @@ package overload; -our $VERSION = '1.23'; +our $VERSION = '1.24'; %ops = ( with_assign => "+ - * / % ** << >> x .", @@ -30,7 +30,7 @@ sub nil {} sub OVERLOAD { $package = shift; my %arg = @_; - my ($sub, $fb); + my $sub; *{$package . "::(("} = \&nil; # Make it findable via fetchmethod. for (keys %arg) { if ($_ eq 'fallback') { -- Perl5 Master Repository
