diff options
| -rwxr-xr-x | configpm | 1 | ||||
| -rw-r--r-- | hints/freebsd.sh | 9 | ||||
| -rw-r--r-- | lib/Pod/Html.pm | 4 | ||||
| -rw-r--r-- | perl.h | 4 | ||||
| -rwxr-xr-x | t/op/grent.t | 6 | ||||
| -rwxr-xr-x | t/op/pwent.t | 6 |
6 files changed, 24 insertions, 6 deletions
@@ -30,6 +30,7 @@ sub import { my $pkg = shift; @_ = @EXPORT unless @_; my @func = grep {$_ ne '%Config'} @_; + local $Exporter::ExportLevel = 1; Exporter::import('Config', @func) if @func; return if @func == @_; my $callpkg = caller(0); diff --git a/hints/freebsd.sh b/hints/freebsd.sh index f841d32b98..2609261fa6 100644 --- a/hints/freebsd.sh +++ b/hints/freebsd.sh @@ -121,6 +121,13 @@ case "$osvers" in ;; esac +case "$osvers" in +4.0*) + if /usr/bin/file /usr/lib/libc.so.3 | /usr/bin/grep -vq "not stripped" ; then + usenm=false + fi +esac + cat <<'EOM' >&4 Some users have reported that Configure halts when testing for @@ -164,7 +171,7 @@ esac cat > UU/usethreads.cbu <<'EOCBU' case "$usethreads" in $define|true|[yY]*) - lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'` + lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|tail -1` case "$osvers" in 2.2.8*|3.*|4.*) if [ ! -r "$lc_r" ]; then diff --git a/lib/Pod/Html.pm b/lib/Pod/Html.pm index 4a8d066e57..5238a1a1a7 100644 --- a/lib/Pod/Html.pm +++ b/lib/Pod/Html.pm @@ -244,8 +244,8 @@ my %items = (); # associative array used to find the location my $Is83; # is dos with short filenames (8.3) sub init_globals { -$dircache = "pod2html.d~~"; -$itemcache = "pod2html.i~~"; +$dircache = "pod2htmd$cache_ext"; +$itemcache = "pod2htmi$cache_ext"; @begin_stack = (); # begin/end stack @@ -173,7 +173,9 @@ struct perl_thread; # define dTHX dTHXa(THR) # define dTHR dNOOP # else -# define MULTIPLICITY +# ifndef MULTIPLICITY +# define MULTIPLICITY +# endif # define pTHX register PerlInterpreter *my_perl # define aTHX my_perl # define dTHXa(a) pTHX = (PerlInterpreter *)a diff --git a/t/op/grent.t b/t/op/grent.t index c9d3797533..761d8b9cf6 100755 --- a/t/op/grent.t +++ b/t/op/grent.t @@ -77,7 +77,11 @@ while (<GR>) { warn "# Your $where line $. is empty.\n"; next; } - last if $n == $max; + if ($n == $max) { + local $/; + my $junk = <GR>; + last; + } # In principle we could whine if @s != 4 but do we know enough # of group file formats everywhere? if (@s == 4) { diff --git a/t/op/pwent.t b/t/op/pwent.t index 788d2f2701..ca14a99eec 100755 --- a/t/op/pwent.t +++ b/t/op/pwent.t @@ -79,7 +79,11 @@ while (<PW>) { warn "# Your $where line $. is empty.\n"; next; } - last if $n == $max; + if ($n == $max) { + local $/; + my $junk = <PW>; + last; + } # In principle we could whine if @s != 7 but do we know enough # of passwd file formats everywhere? if (@s == 7) { |