perl: upgrade from 5.12.3 to 5.14.2

parallel build fix patches are not needed as they are upstream now.
Got a new set of debian patch set for 5.14.2

perl-rpdepends: fix the autogenerated rdepends mistakes
   take out some mdoules which are not going to be built.

[Saul Wold: Remove debug]
(From OE-Core rev: 8dc5f118832a4aca906239ffed82f72497c37f8e)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble 2011-10-19 14:53:17 -07:00 committed by Richard Purdie
parent 53f7342562
commit 5f8f114e4c
92 changed files with 1948 additions and 8642 deletions

View File

@ -1,17 +0,0 @@
Upstream-Status: Inappropriate [embedded specific]
Index: perl-5.12.2/Configure
===================================================================
--- perl-5.12.2.orig/Configure
+++ perl-5.12.2/Configure
@@ -1316,8 +1316,9 @@ loclibpth="/usr/local/lib /opt/local/lib
loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
: general looking path for locating libraries
-glibpth="/lib /usr/lib $xlibpth"
+glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth"
glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+test -f /usr/lib/*-linux-gnu/libc.so && glibpth="/usr/lib/*-linux-gnu $glibpth"
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"

View File

@ -1,15 +0,0 @@
Upstream-Status:Inappropriate [embedded specific]
Index: perl-5.10.1/Makefile.SH
===================================================================
--- perl-5.10.1.orig/Makefile.SH 2010-02-12 19:06:17.000000000 +0300
+++ perl-5.10.1/Makefile.SH 2010-02-12 19:10:13.000000000 +0300
@@ -596,7 +596,7 @@
\$(RUN) ./generate_uudmap\$(HOST_EXE_EXT) >uudmap.h
generate_uudmap\$(HOST_EXE_EXT): generate_uudmap\$(OBJ_EXT)
- \$(CC) -o generate_uudmap\$(EXE_EXT) \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs)
+ \$(BUILD_CC) -o generate_uudmap\$(EXE_EXT) generate_uudmap.c
!GROK!THIS!
$spitshell >>$Makefile <<'!NO!SUBS!'

View File

@ -1,34 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Description: Downgrade the optimization of sv.c on arm due to a gcc-4.4 bug
Bug-Debian: http://bugs.debian.org/580334
Regression from gcc-4.3, not reported yet.
perl -e '"-2" =~ /(.+)/; @foo=(); push @foo, $_ for $1..undef; print @foo ? "ok\n" : "not ok\n"'
---
cflags.SH | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cflags.SH b/cflags.SH
index a5d71b9..6914ba6 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -312,7 +312,11 @@ for file do
regexec) ;;
run) ;;
scope) ;;
- sv) ;;
+ sv)
+ case $archname in
+ arm-*|armeb-*)
+ optimize=-O0;;
+ esac;;
taint) ;;
toke) ;;
universal) ;;
--
tg: (a508b62..) debian/arm_optim (depends on: upstream)

View File

@ -1,24 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
Subject: Set location of CPAN::Config to /etc/perl as /usr may not be writable.
---
cpan/CPAN/lib/CPAN/HandleConfig.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/HandleConfig.pm b/cpan/CPAN/lib/CPAN/HandleConfig.pm
index 76cd81e..65a3b27 100644
--- a/cpan/CPAN/lib/CPAN/HandleConfig.pm
+++ b/cpan/CPAN/lib/CPAN/HandleConfig.pm
@@ -543,7 +543,7 @@ sub load {
$configpm = $INC{"CPAN/MyConfig.pm"};
$redo++;
} else {
- my($path_to_cpan) = File::Basename::dirname($INC{"CPAN.pm"});
+ my($path_to_cpan) = '/etc/perl';
my($configpmdir) = File::Spec->catdir($path_to_cpan,"CPAN");
my($configpmtest) = File::Spec->catfile($configpmdir,"Config.pm");
my $inc_key;
--
tg: (a508b62..) debian/cpan_config_path (depends on: upstream)

View File

@ -1,61 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: Point users to Debian packages of deprecated core modules
Bug-Debian: http://bugs.debian.org/580034
Class::ISA, Switch, Pod::Plainer, and (partially) Shell were
deprecated from the Perl core in 5.12.0.
To get a clean transition, perl-modules is going to recommend the separate
Debian packages of these for one release cycle so that they will be
pulled in by default on upgrades.
However, on systems configured to ignore recommendations the deprecation
warnings will still be useful, so modify them slightly to point to the
separate packages instead.
---
lib/deprecate.pm | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/lib/deprecate.pm b/lib/deprecate.pm
index 7b92e0b..9db7330 100644
--- a/lib/deprecate.pm
+++ b/lib/deprecate.pm
@@ -7,6 +7,16 @@ our $VERSION = 0.01;
our %Config;
unless (%Config) { require Config; *Config = \%Config::Config; }
+# Debian-specific change: recommend the separate Debian packages of
+# deprecated modules where available
+
+my %DEBIAN_PACKAGES = (
+ "Class::ISA" => "libclass-isa-perl",
+ "Pod::Plainer" => "libpod-plainer-perl",
+ "Switch" => "libswitch-perl",
+ "Shell" => "libshell-perl",
+);
+
sub import {
my ($package, $file, $line) = caller;
my $expect_leaf = "$package.pm";
@@ -44,9 +54,15 @@ EOM
if (defined $callers_bitmask
&& (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1)
|| vec($callers_bitmask, $warnings::Offsets{all}, 1))) {
- warn <<"EOM";
+ if (my $deb = $DEBIAN_PACKAGES{$package}) {
+ warn <<"EOM";
+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line.
+EOM
+ } else {
+ warn <<"EOM";
$package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line.
EOM
+ }
}
return;
}
--
tg: (a508b62..) debian/deprecate-with-apt (depends on: upstream)

View File

@ -1,34 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: Work around an ICE on ia64
Closes: 548943
Temporarily work around an internal compiler error in Devel::PPPort
on ia64+gcc-4.3.
---
cpan/Devel-PPPort/Makefile.PL | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cpan/Devel-PPPort/Makefile.PL b/cpan/Devel-PPPort/Makefile.PL
index 67eebc1..f1ef7a2 100644
--- a/cpan/Devel-PPPort/Makefile.PL
+++ b/cpan/Devel-PPPort/Makefile.PL
@@ -75,6 +75,13 @@ sub configure
push @moreopts, INSTALLDIRS => ($] >= 5.007003 ? 'perl' : 'site');
}
+
+ # temporary Debian hack, see http://bugs.debian.org/548943
+ require Config;
+ if ($Config::Config{archname} =~ /^ia64/) {
+ push @moreopts, OPTIMIZE => '-g -O0';
+ }
+
if ($opt{'apicheck'}) {
$PL_FILES{'apicheck_c.PL'} = 'apicheck.c';
push @C_FILES, qw{ apicheck.c };
--
tg: (a508b62..) debian/devel-ppport-ia64-optim (depends on: upstream)

View File

@ -1,315 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
Subject: Various debian-specific ExtUtils changes
* Respect umask during installation, and set as appropriate for each of
perl, vendor and site (policy requires group writable site dirs).
* Don't install .packlist or perllocal.pod for perl or vendor.
* Fiddle with *PREFIX and variables written to the makefile so that
install directories may be changed when make is run by passing
PREFIX= to the "make install" command (used when packaging
modules).
* Set location of libperl.a to /usr/lib.
* Note that libperl-dev package is required for embedded linking.
* Change install target dependencies to facilitate parallel makes.
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 12 +++---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 44 +++++-----------------
cpan/ExtUtils-MakeMaker/t/INST.t | 4 +--
cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | 10 +++---
dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++-----
lib/ExtUtils/Embed.pm | 3 ++
6 files changed, 34 insertions(+), 57 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index 4905aeb..a80ac20 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -701,8 +701,6 @@ all POD files in MAN1PODS and MAN3PODS.
sub manifypods_target {
my($self) = shift;
- my $man1pods = '';
- my $man3pods = '';
my $dependencies = '';
# populate manXpods & dependencies:
@@ -718,7 +716,7 @@ END
foreach my $section (qw(1 3)) {
my $pods = $self->{"MAN${section}PODS"};
push @man_cmds, $self->split_command(<<CMD, %$pods);
- \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
+ \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
CMD
}
@@ -1428,9 +1426,11 @@ sub init_INSTALL_from_PREFIX {
$self->{SITEPREFIX} ||= $sprefix;
$self->{VENDORPREFIX} ||= $vprefix;
- # Lots of MM extension authors like to use $(PREFIX) so we
- # put something sensible in there no matter what.
- $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
+ my $p = $self->{PREFIX} = $self->{PERLPREFIX};
+ for my $t (qw/PERL SITE VENDOR/)
+ {
+ $self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!;
+ }
}
my $arch = $Config{archname};
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 239d6df..940de38 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2046,9 +2046,7 @@ doc__install : doc_site_install
$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
pure_perl_install :: all
- $(NOECHO) $(MOD_INSTALL) \
- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+ $(NOECHO) umask 022; $(MOD_INSTALL) \
$(INST_LIB) $(DESTINSTALLPRIVLIB) \
$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
$(INST_BIN) $(DESTINSTALLBIN) \
@@ -2060,7 +2058,7 @@ pure_perl_install :: all
pure_site_install :: all
- $(NOECHO) $(MOD_INSTALL) \
+ $(NOECHO) umask 02; $(MOD_INSTALL) \
read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLSITELIB) \
@@ -2073,9 +2071,7 @@ pure_site_install :: all
}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
pure_vendor_install :: all
- $(NOECHO) $(MOD_INSTALL) \
- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ $(NOECHO) umask 022; $(MOD_INSTALL) \
$(INST_LIB) $(DESTINSTALLVENDORLIB) \
$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
$(INST_BIN) $(DESTINSTALLVENDORBIN) \
@@ -2084,37 +2080,19 @@ pure_vendor_install :: all
$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
doc_perl_install :: all
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) $(DOC_INSTALL) \
- "Module" "$(NAME)" \
- "installed into" "$(INSTALLPRIVLIB)" \
- LINKTYPE "$(LINKTYPE)" \
- VERSION "$(VERSION)" \
- EXE_FILES "$(EXE_FILES)" \
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
doc_site_install :: all
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) $(DOC_INSTALL) \
+ $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH)
+ -$(NOECHO) umask 02; $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{
doc_vendor_install :: all
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) $(DOC_INSTALL) \
- "Module" "$(NAME)" \
- "installed into" "$(INSTALLVENDORLIB)" \
- LINKTYPE "$(LINKTYPE)" \
- VERSION "$(VERSION)" \
- EXE_FILES "$(EXE_FILES)" \
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
};
@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
$(NOECHO) $(NOOP)
uninstall_from_perldirs ::
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
uninstall_from_sitedirs ::
$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
uninstall_from_vendordirs ::
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
+
};
join("",@m);
@@ -2402,7 +2379,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
}
unless ($libperl && -f $lperl) { # Ilya's code...
- my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
+ my $dir = $self->{PERL_SRC} || "/usr/lib";
$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
$libperl ||= "libperl$self->{LIB_EXT}";
$libperl = "$dir/$libperl";
@@ -2998,8 +2975,7 @@ sub prefixify {
print STDERR " prefixify $var => $path\n" if $Verbose >= 2;
print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2;
- if( $self->{ARGS}{PREFIX} &&
- $path !~ s{^\Q$sprefix\E\b}{$rprefix}s )
+ if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
{
print STDERR " cannot prefix, using default.\n" if $Verbose >= 2;
diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
index 8a140eb..cf1410e 100755
--- a/cpan/ExtUtils-MakeMaker/t/INST.t
+++ b/cpan/ExtUtils-MakeMaker/t/INST.t
@@ -59,9 +59,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
is( $mm->{VERSION}, 0.01, 'VERSION' );
-my $config_prefix = $Config{installprefixexp} || $Config{installprefix} ||
- $Config{prefixexp} || $Config{prefix};
-is( $mm->{PERLPREFIX}, $config_prefix, 'PERLPREFIX' );
+is( $mm->{PERLPREFIX}, '$(PREFIX)', 'PERLPREFIX' );
is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
index 8bb9db8..316546d 100755
--- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
+++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
@@ -10,7 +10,7 @@ BEGIN {
}
use strict;
-use Test::More tests => 52;
+use Test::More tests => 47;
use MakeMaker::Test::Utils;
use MakeMaker::Test::Setup::BFD;
use ExtUtils::MakeMaker;
@@ -56,16 +56,16 @@ like( $stdout->read, qr{
Writing\ $Makefile\ for\ Big::Dummy\n
}x );
-is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
+#is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
isa_ok( $mm, 'ExtUtils::MakeMaker' );
is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
is( $mm->{VERSION}, 0.01, 'VERSION' );
-foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
- unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
-}
+#foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
+# unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
+#}
my $PREFIX = File::Spec->catdir('foo', 'bar');
diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
index da58365..d6d5c11 100644
--- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
@@ -468,7 +468,7 @@ sub _can_write_dir {
=pod
-=item _mkpath($dir,$show,$mode,$verbose,$dry_run)
+=item _mkpath($dir,$show,$verbose,$dry_run)
Wrapper around File::Path::mkpath() to handle errors.
@@ -485,13 +485,13 @@ writable.
=cut
sub _mkpath {
- my ($dir,$show,$mode,$verbose,$dry_run)=@_;
+ my ($dir,$show,$verbose,$dry_run)=@_;
if ( $verbose && $verbose > 1 && ! -d $dir) {
$show= 1;
- printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode;
+ printf "mkpath(%s,%d)\n", $dir, $show;
}
if (!$dry_run) {
- if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) {
+ if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) {
_choke("Can't create '$dir'","$@");
}
@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
_chdir($cwd);
}
foreach my $targetdir (sort keys %check_dirs) {
- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
+ _mkpath( $targetdir, 0, $verbose, $dry_run );
}
foreach my $found (@found_files) {
my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime,
@@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC
$targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' )
unless $dry_run;
} elsif ( ! -d $targetdir ) {
- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
+ _mkpath( $targetdir, 0, $verbose, $dry_run );
}
print "Installing $targetfile\n";
@@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC
if ($pack{'write'}) {
$dir = install_rooted_dir(dirname($pack{'write'}));
- _mkpath( $dir, 0, 0755, $verbose, $dry_run );
+ _mkpath( $dir, 0, $verbose, $dry_run );
print "Writing $pack{'write'}\n" if $verbose;
$packlist->write(install_rooted_file($pack{'write'})) unless $dry_run;
}
@@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory).
sub pm_to_blib {
my($fromto,$autodir,$pm_filter) = @_;
- _mkpath($autodir,0,0755);
+ _mkpath($autodir,0);
while(my($from, $to) = each %$fromto) {
if( -f $to && -s $from == -s $to && -M $to < -M $from ) {
print "Skip $to (unchanged)\n";
@@ -1213,7 +1213,7 @@ sub pm_to_blib {
# we wont try hard here. its too likely to mess things up.
forceunlink($to);
} else {
- _mkpath(dirname($to),0,0755);
+ _mkpath(dirname($to),0);
}
if ($need_filtering) {
run_filter($pm_filter, $from, $to);
diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
index 24ae909..12d421d 100644
--- a/lib/ExtUtils/Embed.pm
+++ b/lib/ExtUtils/Embed.pm
@@ -305,6 +305,9 @@ and extensions in your C/C++ applications.
Typically, an application B<Makefile> will invoke ExtUtils::Embed
functions while building your application.
+Note that on Debian systems the B<libperl-dev> package is required for
+compiling applications which embed an interpreter.
+
=head1 @EXPORT
ExtUtils::Embed exports the following functions:
--
tg: (a508b62..) debian/extutils_hacks (depends on: upstream)

View File

@ -1,100 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: Allow for flock returning EAGAIN instead of EWOULDBLOCK on linux/parisc
Bug-Debian: http://bugs.debian.org/543731
Origin: upstream, http://github.com/pfenwick/autodie/commit/037738e11a6097734b0e1dabdd77b92e5fe35219
---
cpan/autodie/lib/Fatal.pm | 14 +++++++++++++-
cpan/autodie/t/flock.t | 12 ++++++++++--
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/cpan/autodie/lib/Fatal.pm b/cpan/autodie/lib/Fatal.pm
old mode 100644
new mode 100755
index 18e71ed..c17a257
--- a/cpan/autodie/lib/Fatal.pm
+++ b/cpan/autodie/lib/Fatal.pm
@@ -5,6 +5,7 @@ use Carp;
use strict;
use warnings;
use Tie::RefHash; # To cache subroutine refs
+use Config;
use constant PERL510 => ( $] >= 5.010 );
@@ -52,6 +53,10 @@ our %_EWOULDBLOCK = (
MSWin32 => 33,
);
+# the linux parisc port has separate EAGAIN and EWOULDBLOCK,
+# and the kernel returns EAGAIN
+my $try_EAGAIN = ($^O eq 'linux' and $Config{archname} =~ /hppa|parisc/) ? 1 : 0;
+
# We have some tags that can be passed in for use with import.
# These are all assumed to be CORE::
@@ -720,6 +725,11 @@ sub _one_invocation {
my $EWOULDBLOCK = eval { POSIX::EWOULDBLOCK(); }
|| $_EWOULDBLOCK{$^O}
|| _autocroak("Internal error - can't overload flock - EWOULDBLOCK not defined on this system.");
+ my $EAGAIN = $EWOULDBLOCK;
+ if ($try_EAGAIN) {
+ $EAGAIN = eval { POSIX::EAGAIN(); }
+ || _autocroak("Internal error - can't overload flock - EAGAIN not defined on this system.");
+ }
require Fcntl; # For Fcntl::LOCK_NB
@@ -735,7 +745,9 @@ sub _one_invocation {
# If we failed, but we're using LOCK_NB and
# returned EWOULDBLOCK, it's not a real error.
- if (\$_[1] & Fcntl::LOCK_NB() and \$! == $EWOULDBLOCK ) {
+ if (\$_[1] & Fcntl::LOCK_NB() and
+ (\$! == $EWOULDBLOCK or
+ ($try_EAGAIN and \$! == $EAGAIN ))) {
return \$retval;
}
diff --git a/cpan/autodie/t/flock.t b/cpan/autodie/t/flock.t
index a7550ba..6421a56 100755
--- a/cpan/autodie/t/flock.t
+++ b/cpan/autodie/t/flock.t
@@ -2,7 +2,8 @@
use strict;
use Test::More;
use Fcntl qw(:flock);
-use POSIX qw(EWOULDBLOCK);
+use POSIX qw(EWOULDBLOCK EAGAIN);
+use Config;
require Fatal;
@@ -10,6 +11,9 @@ my $EWOULDBLOCK = eval { EWOULDBLOCK() }
|| $Fatal::_EWOULDBLOCK{$^O}
|| plan skip_all => "EWOULDBLOCK not defined on this system";
+my $try_EAGAIN = ($^O eq 'linux' and $Config{archname} =~ /hppa|parisc/) ? 1 : 0;
+my $EAGAIN = eval { EAGAIN() };
+
my ($self_fh, $self_fh2);
eval {
@@ -55,7 +59,11 @@ eval {
$return = flock($self_fh2, LOCK_EX | LOCK_NB);
};
-is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
+if (!$try_EAGAIN) {
+ is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
+} else {
+ ok($!+0 == $EWOULDBLOCK || $!+0 == $EAGAIN, "Double-flocking should be EWOULDBLOCK or EAGAIN");
+}
ok(!$return, "flocking a file twice should fail");
is($@, "", "Non-blocking flock should not fail on EWOULDBLOCK");
--
tg: (a508b62..) fixes/autodie-flock (depends on: upstream)

View File

@ -1,39 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: Fix stack pointer corruption in pp_concat() with 'use encoding'
Bug-Debian: http://bugs.debian.org/596105
Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78674
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e3393f51d48d8b790e26324eb0336fac9689fa46
If the stack is reallocated during pp_concat() and 'use encoding' in
effect, the stack pointer gets corrupted, causing memory allocation bugs
and the like.
---
pp_hot.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/pp_hot.c b/pp_hot.c
index ee699ef..c5ed14e 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -271,6 +271,8 @@ PP(pp_concat)
rbyte = !DO_UTF8(right);
}
if (lbyte != rbyte) {
+ /* sv_utf8_upgrade_nomg() may reallocate the stack */
+ PUTBACK;
if (lbyte)
sv_utf8_upgrade_nomg(TARG);
else {
@@ -279,6 +281,7 @@ PP(pp_concat)
sv_utf8_upgrade_nomg(right);
rpv = SvPV_const(right, rlen);
}
+ SPAGAIN;
}
sv_catpvn_nomg(TARG, rpv, rlen);
--
tg: (a508b62..) fixes/concat-stack-corruption (depends on: upstream)

View File

@ -1,32 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: Fix CPANPLUS test failures when HOME doesn't exist
Bug: http://rt.cpan.org/Public/Bug/Display.html?id=52988
Bug-Debian: http://bugs.debian.org/577011
Origin: upstream
The Debian autobuilders are configured with a non-existing $ENV{HOME},
triggering a bug in CPANPLUS that causes test failures.
Fix from CPANPLUS-0.9001.
---
cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
index 27d2abc..8475c36 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
@@ -5,7 +5,7 @@ use strict;
use CPANPLUS::Error;
use CPANPLUS::Internals::Constants;
-use Cwd qw[chdir];
+use Cwd qw[chdir cwd];
use File::Copy;
use Params::Check qw[check];
use Module::Load::Conditional qw[can_load];
--
tg: (a508b62..) fixes/cpanplus-without-home (depends on: upstream)

View File

@ -1,108 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
Author: Robin Barker <rmbarker@cpan.org>
Subject: h2ph fix for gcc 4.5
Bug-Debian: http://bugs.debian.org/599933
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/8d66b3f930dc6d88b524d103e304308ae73a46e7
Fix h2ph and test. Needed to build with GCC 4.5.
---
lib/h2ph.t | 12 ++++++++++--
utils/h2ph.PL | 28 +++++++++++++++++++++++-----
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/lib/h2ph.t b/lib/h2ph.t
index 27dd7b9..8d62d46 100755
--- a/lib/h2ph.t
+++ b/lib/h2ph.t
@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
exit 0;
}
-plan(4);
+plan(5);
# quickly compare two text files
sub txt_compare {
@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
stderr => 1 );
like( $result, qr/syntax OK$/, "output compiles");
+$result = runperl( progfile => '_h2ph_pre.ph',
+ switches => ['-c'],
+ stderr => 1 );
+like( $result, qr/syntax OK$/, "preamble compiles");
+
$result = runperl( switches => ["-w"],
- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
+ stderr => 1,
+ prog => <<'PROG' );
+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
+PROG
is( $result, '', "output free of warnings" );
# cleanup
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 8f56db4..1255807 100644
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
exit $Exit;
sub expr {
- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
+ if (/\b__asm__\b/) { # freak out
+ $new = '"(assembly code)"';
+ return
+ }
my $joined_args;
if(keys(%curargs)) {
$joined_args = join('|', keys(%curargs));
@@ -770,7 +773,7 @@ sub inc_dirs
sub build_preamble_if_necessary
{
# Increment $VERSION every time this function is modified:
- my $VERSION = 2;
+ my $VERSION = 3;
my $preamble = "$Dest_dir/_h2ph_pre.ph";
# Can we skip building the preamble file?
@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
# parenthesized value: d=(v)
$define{$_} = $1;
}
- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
+ if (/^(\w+)\((\w)\)$/) {
+ my($macro, $arg) = ($1, $2);
+ my $def = $define{$_};
+ $def =~ s/$arg/\$\{$arg\}/g;
+ print PREAMBLE <<DEFINE;
+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
+
+DEFINE
+ } elsif
+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
# float:
print PREAMBLE
"unless (defined &$_) { sub $_() { $1 } }\n\n";
@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
print PREAMBLE
"unless (defined &$_) { sub $_() { $1 } }\n\n";
} elsif ($define{$_} =~ /^\w+$/) {
- print PREAMBLE
- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
+ my $def = $define{$_};
+ if ($isatype{$def}) {
+ print PREAMBLE
+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
+ } else {
+ print PREAMBLE
+ "unless (defined &$_) { sub $_() { &$def } }\n\n";
+ }
} else {
print PREAMBLE
"unless (defined &$_) { sub $_() { \"",
--
tg: (a508b62..) fixes/h2ph-gcc-4.5 (depends on: upstream)

View File

@ -1,97 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: LC_NUMERIC documentation fixes
Bug-Debian: http://bugs.debian.org/379329
Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78452
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/903eb63f7d8d47a38971a8e9af7201b9927882cf
LC_NUMERIC documentation updates fixing two errors:
- the early parts of perllocale.pod still say printf() uses LC_NUMERIC
with just 'use locale' when actually a POSIX::setlocale() call is
also needed
- format() hasn't used LC_NUMERIC unconditionally since 5.005_03
(commit 097ee67dff1c60f201bc09435bc6eaeeafcd8123).
Test cases from the upstream commit dropped for the sake of simplicity.
---
pod/perlform.pod | 20 ++++++++------------
pod/perllocale.pod | 15 ++++++---------
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/pod/perlform.pod b/pod/perlform.pod
index 3cfa1b7..df0f0a1 100644
--- a/pod/perlform.pod
+++ b/pod/perlform.pod
@@ -166,9 +166,9 @@ token on the first line. If an expression evaluates to a number with a
decimal part, and if the corresponding picture specifies that the decimal
part should appear in the output (that is, any picture except multiple "#"
characters B<without> an embedded "."), the character used for the decimal
-point is B<always> determined by the current LC_NUMERIC locale. This
-means that, if, for example, the run-time environment happens to specify a
-German locale, "," will be used instead of the default ".". See
+point is determined by the current LC_NUMERIC locale if C<use locale> is in
+effect. This means that, if, for example, the run-time environment happens
+to specify a German locale, "," will be used instead of the default ".". See
L<perllocale> and L<"WARNINGS"> for more information.
@@ -442,15 +442,11 @@ Lexical variables (declared with "my") are not visible within a
format unless the format is declared within the scope of the lexical
variable. (They weren't visible at all before version 5.001.)
-Formats are the only part of Perl that unconditionally use information
-from a program's locale; if a program's environment specifies an
-LC_NUMERIC locale, it is always used to specify the decimal point
-character in formatted output. Perl ignores all other aspects of locale
-handling unless the C<use locale> pragma is in effect. Formatted output
-cannot be controlled by C<use locale> because the pragma is tied to the
-block structure of the program, and, for historical reasons, formats
-exist outside that block structure. See L<perllocale> for further
-discussion of locale handling.
+If a program's environment specifies an LC_NUMERIC locale and C<use
+locale> is in effect when the format is declared, the locale is used
+to specify the decimal point character in formatted output. Formatted
+output cannot be controlled by C<use locale> at the time when write()
+is called. See L<perllocale> for further discussion of locale handling.
Within strings that are to be displayed in a fixed length text field,
each control character is substituted by a space. (But remember the
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
index 0dbabe7..0bec423 100644
--- a/pod/perllocale.pod
+++ b/pod/perllocale.pod
@@ -115,8 +115,7 @@ ucfirst(), and lcfirst()) use C<LC_CTYPE>
=item *
-B<The formatting functions> (printf(), sprintf() and write()) use
-C<LC_NUMERIC>
+B<Format declarations> (format()) use C<LC_NUMERIC>
=item *
@@ -967,13 +966,11 @@ system's implementation of the locale system than by Perl.
=head2 write() and LC_NUMERIC
-Formats are the only part of Perl that unconditionally use information
-from a program's locale; if a program's environment specifies an
-LC_NUMERIC locale, it is always used to specify the decimal point
-character in formatted output. Formatted output cannot be controlled by
-C<use locale> because the pragma is tied to the block structure of the
-program, and, for historical reasons, formats exist outside that block
-structure.
+If a program's environment specifies an LC_NUMERIC locale and C<use
+locale> is in effect when the format is declared, the locale is used
+to specify the decimal point character in formatted output. Formatted
+output cannot be controlled by C<use locale> at the time when write()
+is called.
=head2 Freely available locale definitions
--
tg: (a508b62..) fixes/lc-numeric-docs (depends on: upstream)

View File

@ -1,31 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
From: Niko Tyni <ntyni@debian.org>
Subject: Fix sprintf not to ignore LC_NUMERIC with constants
Bug-Debian: http://bugs.debian.org/601549
Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78632
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/b3fd61496ebc585b1115807e3195f17714662a09
Don't fold constants in sprintf() if locales are used
An upstream regression in 5.10.1 made sprintf() ignore LC_NUMERIC for
numeric constants.
---
op.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/op.c b/op.c
index e94f158..3c6badb 100644
--- a/op.c
+++ b/op.c
@@ -2503,6 +2503,7 @@ S_fold_constants(pTHX_ register OP *o)
case OP_SLE:
case OP_SGE:
case OP_SCMP:
+ case OP_SPRINTF:
/* XXX what about the numeric ops? */
if (PL_hints & HINT_LOCALE)
goto nope;
--
tg: (a508b62..) fixes/lc-numeric-sprintf (depends on: upstream)

View File

@ -1,45 +0,0 @@
Upstream-Status:Inappropriate [debian patch]
Subject: Always use PERLRUNINST when building perl modules.
Bug-Debian: http://bugs.debian.org/357264
Bug: http://rt.cpan.org/Public/Bug/Display.html?id=17224
Revert part of upstream change 24524 to always use PERLRUNINST when
building perl modules: Some PDL demos expect blib to be implicitly
searched.
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 239d6df..294d266 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -3043,14 +3043,11 @@ sub processPL {
# pm_to_blib depends on then it can't depend on pm_to_blib
# else we have a dependency loop.
my $pm_dep;
- my $perlrun;
if( defined $self->{PM}{$target} ) {
$pm_dep = '';
- $perlrun = 'PERLRUN';
}
else {
$pm_dep = 'pm_to_blib';
- $perlrun = 'PERLRUNINST';
}
$m .= <<MAKE_FRAG;
@@ -3059,7 +3056,7 @@ all :: $target
\$(NOECHO) \$(NOOP)
$target :: $plfile $pm_dep
- \$($perlrun) $plfile $target
+ \$(PERLRUNINST) $plfile $target
MAKE_FRAG
}
--
tg: (a508b62..) fixes/processPL (depends on: upstream)

View File

@ -1,45 +0,0 @@
Subject: List packaged patches for 5.12.3-2 in patchlevel.h
Origin: vendor
Bug-Debian: http://bugs.debian.org/567489
The list can be refreshed from information in debian/patches by running
'debian/rules refresh-patchlevel'.
--- perl/patchlevel.bak
+++ perl/patchlevel.h
@@ -133,0 +134,34 @@
+ ,"DEBPKG:debian/arm_thread_stress_timeout - http://bugs.debian.org/501970 Raise the timeout of ext/threads/shared/t/stress.t to accommodate slower build hosts"
+ ,"DEBPKG:debian/cpan_config_path - Set location of CPAN::Config to /etc/perl as /usr may not be writable."
+ ,"DEBPKG:debian/cpan_definstalldirs - Provide a sensible INSTALLDIRS default for modules installed from CPAN."
+ ,"DEBPKG:debian/db_file_ver - http://bugs.debian.org/340047 Remove overly restrictive DB_File version check."
+ ,"DEBPKG:debian/doc_info - Replace generic man(1) instructions with Debian-specific information."
+ ,"DEBPKG:debian/enc2xs_inc - http://bugs.debian.org/290336 Tweak enc2xs to follow symlinks and ignore missing @INC directories."
+ ,"DEBPKG:debian/errno_ver - http://bugs.debian.org/343351 Remove Errno version check due to upgrade problems with long-running processes."
+ ,"DEBPKG:debian/extutils_hacks - Various debian-specific ExtUtils changes"
+ ,"DEBPKG:debian/fakeroot - Postpone LD_LIBRARY_PATH evaluation to the binary targets."
+ ,"DEBPKG:debian/instmodsh_doc - Debian policy doesn't install .packlist files for core or vendor."
+ ,"DEBPKG:debian/ld_run_path - Remove standard libs from LD_RUN_PATH as per Debian policy."
+ ,"DEBPKG:debian/libnet_config_path - Set location of libnet.cfg to /etc/perl/Net as /usr may not be writable."
+ ,"DEBPKG:debian/m68k_thread_stress - http://bugs.debian.org/495826 Disable some threads tests on m68k for now due to missing TLS."
+ ,"DEBPKG:debian/mod_paths - Tweak @INC ordering for Debian"
+ ,"DEBPKG:debian/module_build_man_extensions - http://bugs.debian.org/479460 Adjust Module::Build manual page extensions for the Debian Perl policy"
+ ,"DEBPKG:debian/prune_libs - http://bugs.debian.org/128355 Prune the list of libraries wanted to what we actually need."
+ ,"DEBPKG:fixes/net_smtp_docs - http://bugs.debian.org/100195 [rt.cpan.org #36038] Document the Net::SMTP 'Port' option"
+ ,"DEBPKG:fixes/processPL - http://bugs.debian.org/357264 [rt.cpan.org #17224] Always use PERLRUNINST when building perl modules."
+ ,"DEBPKG:debian/perlivp - http://bugs.debian.org/510895 Make perlivp skip include directories in /usr/local"
+ ,"DEBPKG:debian/disable-zlib-bundling - Disable zlib bundling in Compress::Raw::Zlib"
+ ,"DEBPKG:debian/cpanplus_definstalldirs - http://bugs.debian.org/533707 Configure CPANPLUS to use the site directories by default."
+ ,"DEBPKG:debian/cpanplus_config_path - Save local versions of CPANPLUS::Config::System into /etc/perl."
+ ,"DEBPKG:fixes/autodie-flock - http://bugs.debian.org/543731 Allow for flock returning EAGAIN instead of EWOULDBLOCK on linux/parisc"
+ ,"DEBPKG:debian/devel-ppport-ia64-optim - http://bugs.debian.org/548943 Work around an ICE on ia64"
+ ,"DEBPKG:fixes/cpanplus-without-home - http://bugs.debian.org/577011 [rt.cpan.org #52988] Fix CPANPLUS test failures when HOME doesn't exist"
+ ,"DEBPKG:debian/arm_optim - http://bugs.debian.org/580334 Downgrade the optimization of sv.c on arm due to a gcc-4.4 bug"
+ ,"DEBPKG:debian/deprecate-with-apt - http://bugs.debian.org/580034 Point users to Debian packages of deprecated core modules"
+ ,"DEBPKG:fixes/hurd-ccflags - http://bugs.debian.org/587901 Make hints/gnu.sh append to $ccflags rather than overriding them"
+ ,"DEBPKG:debian/squelch-locale-warnings - http://bugs.debian.org/508764 Squelch locale warnings in Debian package maintainer scripts"
+ ,"DEBPKG:fixes/lc-numeric-docs - http://bugs.debian.org/379329 [perl #78452] [903eb63] LC_NUMERIC documentation fixes"
+ ,"DEBPKG:fixes/lc-numeric-sprintf - http://bugs.debian.org/601549 [perl #78632] [b3fd614] Fix sprintf not to ignore LC_NUMERIC with constants"
+ ,"DEBPKG:fixes/concat-stack-corruption - http://bugs.debian.org/596105 [perl #78674] [e3393f5] Fix stack pointer corruption in pp_concat() with 'use encoding'"
+ ,"DEBPKG:fixes/h2ph-gcc-4.5 - http://bugs.debian.org/599933 [8d66b3f] h2ph fix for gcc 4.5"
+ ,"DEBPKG:patchlevel - http://bugs.debian.org/567489 List packaged patches for 5.12.3-2 in patchlevel.h"

View File

@ -1,34 +0,0 @@
debian/arm_thread_stress_timeout.diff -p1
debian/cpan_config_path.diff -p1
debian/cpan_definstalldirs.diff -p1
debian/db_file_ver.diff -p1
debian/doc_info.diff -p1
debian/enc2xs_inc.diff -p1
debian/errno_ver.diff -p1
debian/extutils_hacks.diff -p1
debian/fakeroot.diff -p1
debian/instmodsh_doc.diff -p1
debian/ld_run_path.diff -p1
debian/libnet_config_path.diff -p1
debian/m68k_thread_stress.diff -p1
debian/mod_paths.diff -p1
debian/module_build_man_extensions.diff -p1
debian/prune_libs.diff -p1
fixes/net_smtp_docs.diff -p1
fixes/processPL.diff -p1
debian/perlivp.diff -p1
debian/disable-zlib-bundling.diff -p1
debian/cpanplus_definstalldirs.diff -p1
debian/cpanplus_config_path.diff -p1
fixes/autodie-flock.diff -p1
debian/devel-ppport-ia64-optim.diff -p1
fixes/cpanplus-without-home.diff -p1
debian/arm_optim.diff -p1
debian/deprecate-with-apt.diff -p1
fixes/hurd-ccflags.diff -p1
debian/squelch-locale-warnings.diff -p1
fixes/lc-numeric-docs.diff -p1
fixes/lc-numeric-sprintf.diff -p1
fixes/concat-stack-corruption.diff -p1
fixes/h2ph-gcc-4.5.diff -p1
patchlevel -p1

View File

@ -1,27 +0,0 @@
Upstream-Status:Inappropriate [Backport]
Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
2011-02-23
commit 6695a346c41138df5b2c0e26b9a49b1f96137da0
Author: Tony Cook <tony@openbsd32.tony.develop-help.com>
Date: Thu Jul 22 09:54:13 2010 +1000
make_ext.pl populates @INC correctly, don't override it badly
PERL5LIB is populated by make_ext.pl with paths to the modules we need
to run, don't override this with "../../lib" since that may not have
been populated yet in a parallel build.
diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 392b6fb..9e6d091 100644
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,7 +1,3 @@
-# Explicitly avoid including '.' in @INC; autoloader gets confused since it
-# can find POSIX.pm, but can't find autosplit.ix.
-BEGIN { @INC = '../../lib';}
-#
use ExtUtils::MakeMaker;
use ExtUtils::Constant 0.11 'WriteConstants';
use Config;

View File

@ -1,24 +0,0 @@
Upstream-Status:Inappropriate [Backport]
Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
2011-02-23
commit 24e93d7838b346d2ed632075f3d824a325170616
Author: Tony Cook <tony@develop-help.com>
Date: Sat Aug 14 00:21:29 2010 +1000
POSIX/t/posix.t expects a certain start to Makefile.PL
6695a346 changed the start of Makefile.PL, but t/posix.t reads that to
test its read() implementation, restore enough of the original for the
test to pass.
diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 9e6d091..292882c 100644
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,3 +1,4 @@
+# Expect this line to be read by t/posix.t, don't change it
use ExtUtils::MakeMaker;
use ExtUtils::Constant 0.11 'WriteConstants';
use Config;

View File

@ -1,57 +0,0 @@
Upstream-Status:Inappropriate [Backport]
commit 43c0c913165d6abe1bc0cb45a784eb1c32c3700b
Author: Nicholas Clark <nick@ccl4.org>
Date: Mon Feb 14 09:06:42 2011 +0000
For miniperl, use the USE_SITECUSTOMIZE feature to load the build-time @INC
For miniperl (only), always enable USE_SITECUSTOMIZE, but change it to load
a buildcustomize.pl file from $INC[0], if present. The default @INC for
miniperl is '.', so by default this does nothing.
diff --git a/perl.c b/perl.c
index 8f8565d..6bb9f46 100644
--- a/perl.c
+++ b/perl.c
@@ -24,6 +24,10 @@
* function of the interpreter; that can be found in perlmain.c
*/
+#ifdef PERL_IS_MINIPERL
+# define USE_SITECUSTOMIZE
+#endif
+
#include "EXTERN.h"
#define PERL_IN_PERL_C
#include "perl.h"
@@ -1973,15 +1977,26 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
}
}
-#if defined(USE_SITECUSTOMIZE) && !defined(PERL_IS_MINIPERL)
+#if defined(USE_SITECUSTOMIZE)
if (!minus_f) {
- /* SITELIB_EXP is a function call on Win32.
- The games with local $! are to avoid setting errno if there is no
+ /* The games with local $! are to avoid setting errno if there is no
sitecustomize script. */
+# ifdef PERL_IS_MINIPERL
+ AV *const inc = GvAV(PL_incgv);
+ SV **const inc0 = inc ? av_fetch(inc, 0, FALSE) : NULL;
+
+ if (inc0) {
+ (void)Perl_av_create_and_unshift_one(aTHX_ &PL_preambleav,
+ Perl_newSVpvf(aTHX_
+ "BEGIN { do {local $!; -f '%"SVf"/buildcustomize.pl'} && do '%"SVf"/buildcustomize.pl' }", *inc0, *inc0));
+ }
+# else
+ /* SITELIB_EXP is a function call on Win32. */
const char *const sitelib = SITELIB_EXP;
(void)Perl_av_create_and_unshift_one(aTHX_ &PL_preambleav,
Perl_newSVpvf(aTHX_
"BEGIN { do {local $!; -f '%s/sitecustomize.pl'} && do '%s/sitecustomize.pl' }", sitelib, sitelib));
+# endif
}
#endif

View File

@ -1,430 +0,0 @@
Upstream-Status:Inappropriate [Backport]
Rebased by Nitin A Kamble <nitin.a.kamble@intel.com> on 3/11/2011
commit 5e4c4c91bd52a48de59520d5e9b4e3478e49c613
Author: Nicholas Clark <nick@ccl4.org>
Date: Mon Feb 14 10:14:18 2011 +0000
Use a buildcustomize.pl to set @INC in miniperl when building extensions.
With the build tools now shipped in various subdirectories of cpan/ and dist/
we need to add several paths to @INC when invoking MakeMaker (etc) to build
extensions.
The previous approach of using $ENV{PERL5LIB} was fragile, because:
a: It was hitting the length limit for %ENV variables on VMS
b: It was running the risk of race conditions in a parallel build -
ExtUtils::Makemaker "knows" to add -I../..lib, which puts lib at the *front*
of @INC, but if one parallel process happens to copy a module into lib/
whilst another is searching for it, the second may get a partial read
c: Overwriting $ENV{PERL5LIB} breaks any system where any of the installed
build tools are actually implemented in Perl, if they are relying on
$ENV{PERL5LIB} for setup
This approach
a: Doesn't have %ENV length limits
b: Ensures that lib/ is last, so copy targets are always shadowing copy
sources
c: Only affects miniperl, and doesn't touch $ENV{PERL5LIB}
Approaches that turned out to have fatal flaws:
1: Using $ENV{PERL5OPT} with a module fails because ExtUtils::MakeMaker
searches for the build perl without setting lib, and treats the error
caused by a failed -M as "not a valid perl 5 binary"
2: Refactoring ExtUtils::MakeMaker to *not* use -I for lib, and instead rely
on $ENV{PERL5LIB} [which includes "../../lib"] fails because:
some extensions have subdirectories, and on these EU::MM correctly uses
-I../../../lib, where as $ENV{PERL5LIB} only has space for relative paths,
and only with two levels.
This approach actually takes advantage of ExtUtils::MakeMaker setting an -I
option correct for the depth of directory being built.
Index: perl-5.12.3/Cross/Makefile-cross-SH
===================================================================
--- perl-5.12.3.orig/Cross/Makefile-cross-SH
+++ perl-5.12.3/Cross/Makefile-cross-SH
@@ -324,7 +324,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!'
CONFIGPM = xlib/$(CROSS_NAME)/Config.pm
-private = preplibrary $(CONFIGPM) $(CROSS_LIB)/Config.pod
+private = preplibrary $(CONFIGPM) $(CROSS_LIB)/Config.pod lib/buildcustomize.pl
shextract = Makefile cflags config.h makeaperl makedepend \
makedir myconfig writemain pod/Makefile
@@ -752,6 +752,9 @@ lib/lib.pm: miniperl $(CONFIGPM)
@-rm -f $@
$(LDLIBPTH) ./miniperl -Ilib -MCross lib/lib_pm.PL
+lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl
+ $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl
+
unidatafiles $(unidatafiles): uni.data
uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables
@@ -922,16 +925,16 @@ manicheck: FORCE
-$(DYNALOADER): preplibrary FORCE
+$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE
@$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --cross $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
-d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE
+d_dummy $(dynamic_ext): miniperl$(EXE_EXT) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
@$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --cross $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
-s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE
+s_dummy $(static_ext): miniperl$(EXE_EXT) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
@$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --cross $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
-n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
+n_dummy $(nonxs_ext): miniperl$(EXE_EXT) lib/buildcustomize.pl preplibrary $(DYNALOADER) FORCE
@$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --cross $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
!NO!SUBS!
Index: perl-5.12.3/MANIFEST
===================================================================
--- perl-5.12.3.orig/MANIFEST
+++ perl-5.12.3/MANIFEST
@@ -4747,6 +4747,7 @@ win32/wince.c WinCE port
win32/wince.h WinCE port
win32/wincesck.c WinCE port
writemain.SH Generate perlmain.c from miniperlmain.c+extensions
+write_buildcustomize.pl Generate lib/buildcustomize.pl
x2p/a2p.c Output of a2p.y run through byacc
x2p/a2p.h Global declarations
x2p/a2p.pod Pod for awk to perl translator
Index: perl-5.12.3/Makefile.SH
===================================================================
--- perl-5.12.3.orig/Makefile.SH
+++ perl-5.12.3/Makefile.SH
@@ -428,7 +428,7 @@ esac
## In the following dollars and backticks do not need the extra backslash.
$spitshell >>$Makefile <<'!NO!SUBS!'
-private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm git_version.h
+private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm git_version.h lib/buildcustomize.pl
# Files to be built with variable substitution before miniperl
# is available.
@@ -991,6 +991,9 @@ $(plextract): $(MINIPERL_EXE) $(CONFIGPM
x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
cd x2p; $(LDLIBPTH) $(MAKE) s2p
+lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl
+ $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl
+
unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
@@ -1160,16 +1163,16 @@ manicheck: FORCE
#
# DynaLoader may be needed for extensions that use Makefile.PL.
-$(DYNALOADER): $(MINIPERL_EXE) preplibrary FORCE $(nonxs_ext)
+$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
-d_dummy $(dynamic_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
+d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
-s_dummy $(static_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE
+s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
-n_dummy $(nonxs_ext): $(MINIPERL_EXE) preplibrary FORCE
+n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
!NO!SUBS!
Index: perl-5.12.3/installperl
===================================================================
--- perl-5.12.3.orig/installperl
+++ perl-5.12.3/installperl
@@ -714,6 +714,8 @@ sub installlib {
# ignore the test extensions
return if $dir =~ m{\bXS/(?:APItest|Typemap)\b};
return if $name =~ m{\b(?:APItest|Typemap)\.pm$};
+ # ignore the build support code
+ return if $name =~ /\bbuildcustomize\.pl$/;
# ignore the demo files
return if $dir =~ /\b(?:demos?|eg)\b/;
Index: perl-5.12.3/make_ext.pl
===================================================================
--- perl-5.12.3.orig/make_ext.pl
+++ perl-5.12.3/make_ext.pl
@@ -4,11 +4,9 @@ use warnings;
use Config;
BEGIN {
if ($^O eq 'MSWin32') {
- unshift @INC, ('../cpan/Cwd', '../cpan/Cwd/lib');
- require File::Spec::Functions;
+ unshift @INC, '../cpan/Cwd';
require FindExt;
- }
- else {
+ } else {
unshift @INC, 'cpan/Cwd';
}
}
@@ -18,27 +16,6 @@ my $is_Win32 = $^O eq 'MSWin32';
my $is_VMS = $^O eq 'VMS';
my $is_Unix = !$is_Win32 && !$is_VMS;
-# To clarify, this isn't the entire suite of modules considered "toolchain"
-# It's not even all modules needed to build ext/
-# It's just the source paths of the (minimum complete set of) modules in ext/
-# needed to build the nonxs modules
-# After which, all nonxs modules are in lib, which was always sufficient to
-# allow miniperl to build everything else.
-
-# This list cannot get any longer without overflowing the length limit for
-# environment variables on VMS
-my @toolchain = qw(cpan/AutoLoader/lib
- cpan/Cwd cpan/Cwd/lib
- cpan/ExtUtils-Command/lib
- dist/ExtUtils-Install/lib
- cpan/ExtUtils-MakeMaker/lib
- cpan/ExtUtils-Manifest/lib
- cpan/File-Path/lib
- );
-
-# Used only in ExtUtils::Liblist::Kid::_win32_ext()
-push @toolchain, 'cpan/Text-ParseWords/lib' if $is_Win32;
-
my @ext_dirs = qw(cpan dist ext);
my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')';
@@ -295,16 +272,7 @@ sub build_extension {
$perl ||= "$up/miniperl";
my $return_dir = $up;
my $lib_dir = "$up/lib";
- # $lib_dir must be last, as we're copying files into it, and in a parallel
- # make there's a race condition if one process tries to open a module that
- # another process has half-written.
- my @new_inc = ((map {"$up/$_"} @toolchain), $lib_dir);
- if ($is_Win32) {
- @new_inc = map {File::Spec::Functions::rel2abs($_)} @new_inc;
- }
- $ENV{PERL5LIB} = join $Config{path_sep}, @new_inc;
$ENV{PERL_CORE} = 1;
- # warn $ENV{PERL5LIB};
my $makefile;
if ($is_VMS) {
@@ -375,7 +343,7 @@ EOM
@cross = '-MCross';
}
- my @args = (@cross, 'Makefile.PL');
+ my @args = ("-I$lib_dir", @cross, 'Makefile.PL');
if ($is_VMS) {
my $libd = VMS::Filespec::vmspath($lib_dir);
push @args, "INST_LIB=$libd", "INST_ARCHLIB=$libd";
Index: perl-5.12.3/vms/descrip_mms.template
===================================================================
--- perl-5.12.3.orig/vms/descrip_mms.template
+++ perl-5.12.3/vms/descrip_mms.template
@@ -360,7 +360,7 @@ CRTLOPTS =,$(CRTL)/Options
unidatadirs = lib/unicore/To lib/unicore/lib
# Modules which must be installed before we can build extensions
-LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]re.pm
+LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]re.pm [.lib]buildcustomize.pl
utils1 = [.lib.pods]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com
utils2 = [.utils]h2xs.com [.utils]libnetcfg.com [.lib]perlbug.com [.utils]dprofpp.com
@@ -458,6 +458,9 @@ archcorefiles : $(ac) $(ARCHAUTO)time.st
[.lib]re.pm : [.ext.re]re.pm
Copy/NoConfirm/Log $(MMS$SOURCE) [.lib]
+[.lib]buildcustomize.pl : write_buildcustomize.pl $(MINIPERL_EXE)
+ $(MINIPERL) write_buildcustomize.pl > [.lib]buildcustomize.pl
+
vmspipe.com : [.vms]vmspipe.com
Copy/NoConfirm/Log $(MMS$SOURCE) []
@@ -561,7 +564,7 @@ unidatafiles.ts : $(MINIPERL_EXE) [.lib]
@ If F$Search("$(MMS$TARGET)").nes."" Then Delete/NoLog/NoConfirm $(MMS$TARGET);*
@ Copy/NoConfirm _NLA0: $(MMS$TARGET)
-DynaLoader$(O) : $(ARCHDIR)Config.pm $(MINIPERL_EXE) [.lib.VMS]Filespec.pm
+DynaLoader$(O) : [.lib]buildcustomize.pl $(ARCHDIR)Config.pm $(MINIPERL_EXE) [.lib.VMS]Filespec.pm
$(MINIPERL) make_ext.pl "MAKE=$(MMS)" "DynaLoader"
dynext : $(LIBPREREQ) $(DBG)perlshr$(E) unidatafiles.ts DynaLoader$(O) preplibrary makeppport $(MINIPERL_EXE)
@@ -1856,6 +1859,7 @@ tidy : cleanlis
- If F$Search("[.utils]*.com;-1").nes."" Then Purge/NoConfirm/Log [.utils]*.com
- If F$Search("[.x2p]*.com;-1").nes."" Then Purge/NoConfirm/Log [.x2p]*.com
- If F$Search("[.lib.pods]*.com;-1").nes."" Then Purge/NoConfirm/Log [.lib.pods]*.com
+ - If F$Search("[.lib]buildcustomize.pl;-1").nes."" Then Purge/NoConfirm/Log [.lib]buildcustomize.pl
clean : tidy cleantest
- $(MINIPERL) make_ext.pl "MAKE=$(MMS)" "--all" "--target=clean"
Index: perl-5.12.3/win32/Makefile
===================================================================
--- perl-5.12.3.orig/win32/Makefile
+++ perl-5.12.3/win32/Makefile
@@ -923,6 +923,9 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c
-$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)"
if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM)
+..\lib\buildcustomize.pl: $(MINIPERL) ..\write_buildcustomize.pl
+ $(MINIPERL) -I..\lib ..\write_buildcustomize.pl .. >..\lib\buildcustomize.pl
+
$(MINIPERL) : $(MINIDIR) $(MINI_OBJ)
$(LINK32) -subsystem:console -out:$@ @<<
$(LINK_FLAGS) $(LIBFILES) $(MINI_OBJ)
@@ -1045,24 +1048,24 @@ MakePPPort: $(MINIPERL) $(CONFIGPM) Exte
#-------------------------------------------------------------------------------
# There's no direct way to mark a dependency on
# DynaLoader.pm, so this will have to do
-Extensions: ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
+Extensions: ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --dynamic
-Extensions_reonly: ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
+Extensions_reonly: ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --dynamic +re
-Extensions_static : ..\make_ext.pl list_static_libs.pl $(PERLDEP) $(CONFIGPM)
+Extensions_static : ..\make_ext.pl ..\lib\buildcustomize.pl list_static_libs.pl $(PERLDEP) $(CONFIGPM)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --static
$(MINIPERL) -I..\lib list_static_libs.pl > Extensions_static
-Extensions_nonxs: ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+Extensions_nonxs: ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --nonxs
-$(DYNALOADER) : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) Extensions_nonxs
+$(DYNALOADER) : ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM) Extensions_nonxs
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynaloader
@@ -1159,6 +1162,7 @@ distclean: realclean
-del /f $(LIBDIR)\Win32CORE.pm
-del /f $(LIBDIR)\Win32API\File.pm
-del /f $(LIBDIR)\Win32API\File\cFile.pc
+ -del /f $(LIBDIR)\buildcustomize.pl
-del /f $(DISTDIR)\XSLoader\XSLoader.pm
-if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App
-if exist $(LIBDIR)\Archive rmdir /s /q $(LIBDIR)\Archive
Index: perl-5.12.3/win32/makefile.mk
===================================================================
--- perl-5.12.3.orig/win32/makefile.mk
+++ perl-5.12.3/win32/makefile.mk
@@ -1215,6 +1215,10 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c
$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" \
|| $(MAKE) $(MAKEMACROS) $(CONFIGPM) $(MAKEFILE)
+..\lib\buildcustomize.pl: $(MINIPERL) ..\write_buildcustomize.pl
+ $(MINIPERL) -I..\lib ..\write_buildcustomize.pl .. >..\lib\buildcustomize.pl
+
+
$(MINIPERL) : $(MINIDIR) $(MINI_OBJ) $(CRTIPMLIBS)
.IF "$(CCTYPE)" == "BORLAND"
if not exist $(CCLIBDIR)\PSDK\odbccp32.lib \
@@ -1423,24 +1427,24 @@ MakePPPort: $(MINIPERL) $(CONFIGPM) Exte
#-------------------------------------------------------------------------------
# There's no direct way to mark a dependency on
# DynaLoader.pm, so this will have to do
-Extensions : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
+Extensions : ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --dynamic
-Extensions_reonly : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
+Extensions_reonly : ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --dynamic +re
-Extensions_static : ..\make_ext.pl list_static_libs.pl $(PERLDEP) $(CONFIGPM)
+Extensions_static : ..\make_ext.pl ..\lib\buildcustomize.pl list_static_libs.pl $(PERLDEP) $(CONFIGPM)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --static
$(MINIPERL) -I..\lib list_static_libs.pl > Extensions_static
-Extensions_nonxs : ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+Extensions_nonxs : ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --nonxs
-$(DYNALOADER) : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) Extensions_nonxs
+$(DYNALOADER) : ..\make_ext.pl ..\lib\buildcustomize.pl $(PERLDEP) $(CONFIGPM) Extensions_nonxs
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynaloader
@@ -1534,6 +1538,7 @@ distclean: realclean
-del /f $(LIBDIR)\Win32CORE.pm
-del /f $(LIBDIR)\Win32API\File.pm
-del /f $(LIBDIR)\Win32API\File\cFile.pc
+ -del /f $(LIBDIR)\buildcustomize.pl
-del /f $(DISTDIR)\XSLoader\XSLoader.pm
-if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App
-if exist $(LIBDIR)\Archive rmdir /s /q $(LIBDIR)\Archive
Index: perl-5.12.3/write_buildcustomize.pl
===================================================================
--- /dev/null
+++ perl-5.12.3/write_buildcustomize.pl
@@ -0,0 +1,50 @@
+#!./miniperl -w
+
+use strict;
+if (@ARGV) {
+ my $dir = shift;
+ chdir $dir or die "Can't chdir '$dir': $!";
+ unshift @INC, 'lib';
+}
+
+unshift @INC, ('cpan/Cwd', 'cpan/Cwd/lib');
+require File::Spec::Functions;
+
+# To clarify, this isn't the entire suite of modules considered "toolchain"
+# It's not even all modules needed to build ext/
+# It's just the source paths of the (minimum complete set of) modules in ext/
+# needed to build the nonxs modules
+# After which, all nonxs modules are in lib, which was always sufficient to
+# allow miniperl to build everything else.
+
+my @toolchain = qw(cpan/AutoLoader/lib
+ cpan/Cwd cpan/Cwd/lib
+ cpan/ExtUtils-Command/lib
+ dist/ExtUtils-Install/lib
+ cpan/ExtUtils-MakeMaker/lib
+ cpan/ExtUtils-Manifest/lib
+ cpan/File-Path/lib
+ );
+
+# Used only in ExtUtils::Liblist::Kid::_win32_ext()
+push @toolchain, 'cpan/Text-ParseWords/lib' if $^O eq 'MSWin32';
+
+# lib must be last, as the the toolchain modules write themselves into it
+# as they build, and it's important that @INC order ensures that the partially
+# written files are always masked by the complete versions.
+
+my $inc = join ",\n ",
+ map { "q\0$_\0" }
+ (map {File::Spec::Functions::rel2abs($_)} @toolchain, 'lib'), '.';
+
+# If any of the system's build tools are written in Perl, then this module
+# may well be loaded by a much older version than we are building. So keep it
+# as backwards compatible as is easy.
+print <<"EOT";
+#!perl
+
+# We are miniperl, building extensions
+# Reset \@INC completely, adding the directories we need, and removing the
+# installed directories (which we don't need to read, and may confuse us)
+\@INC = ($inc);
+EOT

View File

@ -1,158 +0,0 @@
Upstream-Status:Inappropriate [Backport]
Rebased by Nitin A Kamble <nitin.a.kamble@intel.com> on 3/11/2011
commit 7353f64c5bca6e7102582a1e0017c850930249c3
Author: Nicholas Clark <nick@ccl4.org>
Date: Mon Feb 14 20:36:36 2011 +0000
Add ext/re/re.pm to the @INC set for miniperl by lib/buildcustomize.pl
This avoids a build-time race condition where lib/re.pm might be read midway
through the *second* copy of it (when ext/re/Makefile is being run). It also
simplifies many [Mm]akefile* rules, which previously had a special case to
copy it early.
Index: perl-5.12.3/Cross/Makefile-cross-SH
===================================================================
--- perl-5.12.3.orig/Cross/Makefile-cross-SH
+++ perl-5.12.3/Cross/Makefile-cross-SH
@@ -727,7 +727,7 @@ fi
$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: preplibrary
-preplibrary: miniperl $(CONFIGPM) lib/lib.pm lib/re.pm $(PREPLIBRARY_LIBPERL)
+preplibrary: miniperl $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
.PHONY: makeppport
makeppport: miniperl$(EXE_EXT) $(CONFIGPM)
@@ -748,10 +748,6 @@ $(plextract): miniperl $(CONFIGPM) x2p/s
@-rm -f $@
$(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL
-lib/lib.pm: miniperl $(CONFIGPM)
- @-rm -f $@
- $(LDLIBPTH) ./miniperl -Ilib -MCross lib/lib_pm.PL
-
lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl
$(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl
@@ -1212,7 +1208,7 @@ minitest.prep:
# Can't depend on lib/Config.pm because that might be where miniperl
# is crashing.
-minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep
+minitest: miniperl$(EXE_EXT) minitest.prep
- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
&& $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
Index: perl-5.12.3/Makefile.SH
===================================================================
--- perl-5.12.3.orig/Makefile.SH
+++ perl-5.12.3/Makefile.SH
@@ -970,7 +970,7 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: preplibrary
-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL)
+preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
$(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)
@@ -980,10 +980,6 @@ $(CONFIGPOD): config.sh $(MINIPERL_EXE)
lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM)
$(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm
-lib/re.pm: ext/re/re.pm
- @-rm -f $@
- cp ext/re/re.pm lib/re.pm
-
$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext)
@-rm -f $@
$(MINIPERL) $@.PL
@@ -1267,7 +1263,7 @@ _cleaner2:
rm -f lib/.exists lib/*/.exists lib/*/*/.exists
rm -f h2ph.man pstruct
rm -rf .config
- rm -f preload lib/re.pm
+ rm -f preload
rm -rf lib/Encode lib/Compress lib/Hash lib/re
rm -rf lib/TAP lib/Module/Pluggable lib/App
rm -rf lib/mro
@@ -1464,7 +1460,7 @@ minitest.prep:
# Can't depend on lib/Config.pm because that might be where miniperl
# is crashing.
-minitest: $(MINIPERL_EXE) lib/re.pm minitest.prep
+minitest: $(MINIPERL_EXE) minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
&& $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
Index: perl-5.12.3/vms/descrip_mms.template
===================================================================
--- perl-5.12.3.orig/vms/descrip_mms.template
+++ perl-5.12.3/vms/descrip_mms.template
@@ -360,7 +360,7 @@ CRTLOPTS =,$(CRTL)/Options
unidatadirs = lib/unicore/To lib/unicore/lib
# Modules which must be installed before we can build extensions
-LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]re.pm [.lib]buildcustomize.pl
+LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]buildcustomize.pl
utils1 = [.lib.pods]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com
utils2 = [.utils]h2xs.com [.utils]libnetcfg.com [.lib]perlbug.com [.utils]dprofpp.com
@@ -455,9 +455,6 @@ pod = $(pod0) $(pod1) $(pod2) $(pod3) $(
archcorefiles : $(ac) $(ARCHAUTO)time.stamp
@ $(NOOP)
-[.lib]re.pm : [.ext.re]re.pm
- Copy/NoConfirm/Log $(MMS$SOURCE) [.lib]
-
[.lib]buildcustomize.pl : write_buildcustomize.pl $(MINIPERL_EXE)
$(MINIPERL) write_buildcustomize.pl > [.lib]buildcustomize.pl
@@ -1487,7 +1484,7 @@ test_harness : all [.t.lib]vmsfspec.t
- @[.vms]test.com "$(E)" "$(__DEBUG__)"
@ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests.
-minitest : $(MINITEST_EXE) [.lib]re.pm [.lib.VMS]Filespec.pm unidatafiles.ts
+minitest : $(MINITEST_EXE) [.lib.VMS]Filespec.pm unidatafiles.ts
@ PERL_TEST_DRIVER == "minitest"
- @[.vms]test.com "$(E)" "$(__DEBUG__)"
Index: perl-5.12.3/win32/Makefile
===================================================================
--- perl-5.12.3.orig/win32/Makefile
+++ perl-5.12.3/win32/Makefile
@@ -918,7 +918,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c
if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(XCOPY) *.h $(COREDIR)\*.*
- $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.*
$(RCOPY) include $(COREDIR)\*.*
-$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)"
if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM)
Index: perl-5.12.3/win32/makefile.mk
===================================================================
--- perl-5.12.3.orig/win32/makefile.mk
+++ perl-5.12.3/win32/makefile.mk
@@ -1210,7 +1210,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c
if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL)
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(XCOPY) *.h $(COREDIR)\*.*
- $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.*
$(RCOPY) include $(COREDIR)\*.*
$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" \
|| $(MAKE) $(MAKEMACROS) $(CONFIGPM) $(MAKEFILE)
Index: perl-5.12.3/write_buildcustomize.pl
===================================================================
--- perl-5.12.3.orig/write_buildcustomize.pl
+++ perl-5.12.3/write_buildcustomize.pl
@@ -24,6 +24,7 @@ my @toolchain = qw(cpan/AutoLoader/lib
cpan/ExtUtils-MakeMaker/lib
dist/ExtUtils-Manifest/lib
cpan/File-Path/lib
+ ext/re
);
# Used only in ExtUtils::Liblist::Kid::_win32_ext()

View File

@ -1,29 +1,19 @@
Upstream-Status:Inappropriate [embedded specific]
Index: perl-5.12.3/Makefile.SH
Index: perl-5.14.2/Makefile.SH
===================================================================
--- perl-5.12.3.orig/Makefile.SH
+++ perl-5.12.3/Makefile.SH
@@ -50,12 +50,12 @@ case "$useshrplib" in
--- perl-5.14.2.orig/Makefile.SH
+++ perl-5.14.2/Makefile.SH
@@ -36,7 +36,7 @@ case "$useshrplib" in
true)
# Prefix all runs of 'miniperl' and 'perl' with
# $ldlibpth so that ./perl finds *this* shared libperl.
- case "$LD_LIBRARY_PATH" in
- '')
- ldlibpth="LD_LIBRARY_PATH=`pwd`";;
- *)
- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
- esac
+# case "$LD_LIBRARY_PATH" in
+# '')
+# ldlibpth="LD_LIBRARY_PATH=`pwd`";;
+# *)
+# ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
+# esac
- ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
+ #ldlibpth=LD_LIBRARY_PATH=`pwd`'$${LD_LIBRARY_PATH:+:}$$LD_LIBRARY_PATH'
pldlflags="$cccdlflags"
static_ldflags=''
@@ -133,7 +133,8 @@ true)
@@ -114,7 +114,8 @@ true)
ldlibpth=''
;;
*)
@ -33,7 +23,7 @@ Index: perl-5.12.3/Makefile.SH
;;
esac
# Strip off any trailing :'s
@@ -154,18 +155,7 @@ true)
@@ -135,18 +136,7 @@ true)
# INSTALL file, under "Building a shared perl library".
# If there is no pre-existing $libperl, we don't need
# to do anything further.
@ -53,7 +43,7 @@ Index: perl-5.12.3/Makefile.SH
;;
os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
;;
@@ -557,9 +547,19 @@ splintfiles = $(c1)
@@ -529,9 +519,19 @@ splintfiles = $(c1)
.c.s:
$(CCCMDSRC) -S $*.c
@ -76,7 +66,7 @@ Index: perl-5.12.3/Makefile.SH
.PHONY: all translators utilities
@@ -567,16 +567,16 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(
@@ -539,7 +539,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(
# by make_patchnum.pl.
git_version.h: lib/Config_git.pl
@ -85,18 +75,45 @@ Index: perl-5.12.3/Makefile.SH
$(MINIPERL) make_patchnum.pl
# make sure that we recompile perl.c if the git version changes
perl$(OBJ_EXT): git_version.h
@@ -552,8 +552,8 @@ perl$(OBJ_EXT): git_version.h
# loading, we need to build perl first.
case "$usedl" in
define)
- util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
- x2p_deps='$(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE'
+ util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
+ x2p_deps='$(CONFIGPM) $(dynamic_ext) FORCE'
;;
*) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
x2p_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
@@ -627,7 +627,7 @@ generate_uudmap$(HOST_EXE_EXT): generate
miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
$(CCCMD) $(PLDLFLAGS) $*.c
-translators: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE
+translators: $(CONFIGPM) $(dynamic_ext) FORCE
@echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
-perlmain.c: $(MINIPERL_EXE) lib/ExtUtils/Miniperl.pm
+perlmain.c: lib/ExtUtils/Miniperl.pm
$(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(@ARGV)' DynaLoader $(static_ext) > perlmain.c
-utilities: $(MINIPERL_EXE) $(CONFIGPM) $(plextract) FORCE
+utilities: $(CONFIGPM) $(plextract) FORCE
@echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
perlmain$(OBJ_EXT): perlmain.c
@@ -691,7 +691,7 @@ PERLEXPORT = perl.exp
;;
esac
$spitshell >>$Makefile <<'!NO!SUBS!'
-perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH)
+perl.exp: makedef.pl config.sh $(SYM) $(SYMH)
./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp
!NO!SUBS!
@@ -700,7 +700,7 @@ os2)
$spitshell >>$Makefile <<'!NO!SUBS!'
MINIPERLEXP = miniperl
@@ -754,7 +754,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI
-perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
+perl5.def: makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
!NO!SUBS!
@@ -757,7 +757,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI
true)
$spitshell >>$Makefile <<'!NO!SUBS!'
rm -f $@
@ -105,7 +122,7 @@ Index: perl-5.12.3/Makefile.SH
!NO!SUBS!
case "$osname" in
aix)
@@ -795,7 +795,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
@@ -798,7 +798,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
$(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) \
$(mini_obj) \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
@ -116,7 +133,7 @@ Index: perl-5.12.3/Makefile.SH
!NO!SUBS!
;;
next4*)
@@ -803,7 +805,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
@@ -806,7 +808,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) perlmini$(OBJ_EXT) opmini$(OBJ_EXT)
$(CC) -o $(MINIPERL_EXE) $(mini_obj) \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
@ -127,7 +144,7 @@ Index: perl-5.12.3/Makefile.SH
!NO!SUBS!
;;
darwin*)
@@ -825,7 +829,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
@@ -828,7 +832,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
$(mini_obj) \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
@ -138,7 +155,7 @@ Index: perl-5.12.3/Makefile.SH
!NO!SUBS!
;;
*)
@@ -835,7 +841,10 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
@@ -838,7 +844,10 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
$(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
$(mini_obj) \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
@ -150,7 +167,7 @@ Index: perl-5.12.3/Makefile.SH
!NO!SUBS!
;;
esac
@@ -957,7 +966,7 @@ case "${osname}" in
@@ -960,7 +969,7 @@ case "${osname}" in
catamount)
$spitshell >>$Makefile <<!GROK!THIS!
.PHONY: makeppport
@ -159,7 +176,7 @@ Index: perl-5.12.3/Makefile.SH
-@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
(cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
done
@@ -967,7 +976,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM
@@ -970,7 +979,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM
*)
$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: makeppport
@ -168,7 +185,7 @@ Index: perl-5.12.3/Makefile.SH
$(MINIPERL) $(Icwd) mkppport
!NO!SUBS!
@@ -977,29 +986,29 @@ esac
@@ -980,22 +989,22 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: preplibrary
@ -185,15 +202,6 @@ Index: perl-5.12.3/Makefile.SH
+lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
$(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm
-$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext)
+$(plextract): $(CONFIGPM) x2p/s2p $(dynamic_ext)
@-rm -f $@
$(MINIPERL) $@.PL
-x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
+x2p/s2p: $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
cd x2p; $(LDLIBPTH) $(MAKE) s2p
-lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl
+lib/buildcustomize.pl: write_buildcustomize.pl
$(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl
@ -205,13 +213,13 @@ Index: perl-5.12.3/Makefile.SH
$(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
# Commented out so always runs, mktables looks at far more files than we
# can in this makefile to decide if needs to run or not
@@ -1008,21 +1017,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
@@ -1004,21 +1013,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
# $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re
# But also this ensures that all extensions are built before we try to scan
# them, which picks up Devel::PPPort's documentation.
-pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc
- $(RUN_PERL) -f -Ilib pod/buildtoc --build-toc -q
+pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc
+pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc
+ $(MINIPERL) -f -Ilib pod/buildtoc --build-toc -q
pod/perlapi.pod: pod/perlintern.pod
@ -224,15 +232,15 @@ Index: perl-5.12.3/Makefile.SH
+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
$(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
pod/perldelta.pod: pod/perl5123delta.pod
$(LNS) perl5123delta.pod pod/perldelta.pod
pod/perl5142delta.pod: pod/perldelta.pod
$(LNS) perldelta.pod pod/perl5142delta.pod
-extra.pods: $(MINIPERL_EXE)
+extra.pods:
+extra.pods:
-@test ! -f extra.pods || rm -f `cat extra.pods`
-@rm -f extra.pods
-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
@@ -1065,11 +1074,7 @@ no-install:
@@ -1058,11 +1067,7 @@ no-install:
INSTALL_DEPENDENCE = all
install.perl: $(INSTALL_DEPENDENCE) installperl
@ -245,7 +253,7 @@ Index: perl-5.12.3/Makefile.SH
# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.
@@ -1166,16 +1171,16 @@ manicheck: FORCE
@@ -1161,16 +1166,16 @@ manicheck: FORCE
#
# DynaLoader may be needed for extensions that use Makefile.PL.
@ -266,12 +274,12 @@ Index: perl-5.12.3/Makefile.SH
$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
!NO!SUBS!
@@ -1373,10 +1378,10 @@ _test:
@@ -1365,10 +1370,10 @@ _test:
test_prep_pre: preplibrary utilities $(nonxs_ext)
-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests
+test_prep: test_prep_pre $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests
-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
+test_prep: test_prep_pre $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
-test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
@ -279,12 +287,12 @@ Index: perl-5.12.3/Makefile.SH
$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
@@ -1467,7 +1472,7 @@ minitest.prep:
@@ -1459,7 +1464,7 @@ minitest.prep:
# Can't depend on lib/Config.pm because that might be where miniperl
# is crashing.
-minitest: $(MINIPERL_EXE) minitest.prep
+minitest: minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
&& $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
&& $(RUN_PERL) TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty

View File

@ -1,12 +1,11 @@
Upstream-Status:Inappropriate [embedded specific]
Index: perl-5.12.3/Cross/Makefile
Index: perl-5.14.2/Cross/Makefile
===================================================================
--- perl-5.12.3.orig/Cross/Makefile
+++ perl-5.12.3/Cross/Makefile
@@ -2,7 +2,8 @@
#
## $Id: Makefile,v 1.5 2003/12/12 00:48:19 red Exp red $
--- perl-5.14.2.orig/Cross/Makefile
+++ perl-5.14.2/Cross/Makefile
@@ -1,6 +1,7 @@
## Toplevel Makefile for cross-compilation of perl
-export TOPDIR=${shell pwd}
+override TOPDIR=${shell pwd}
@ -14,7 +13,7 @@ Index: perl-5.12.3/Cross/Makefile
include $(TOPDIR)/config
export CFLAGS
export SYS=$(ARCH)-$(OS)
@@ -12,7 +13,7 @@ export OPTIMIZATION = -O2
@@ -10,7 +11,7 @@ export OPTIMIZATION = -O2
export CC = $(CROSS)gcc
export CXX = $(CROSS)g++
@ -23,7 +22,7 @@ Index: perl-5.12.3/Cross/Makefile
export STRIP = $(CROSS)strip
export AR = $(CROSS)ar
export RANLIB = $(CROSS)ranlib
@@ -34,17 +35,6 @@ CFLAGS+=$(FULL_OPTIMIZATION)
@@ -32,17 +33,6 @@ CFLAGS+=$(FULL_OPTIMIZATION)
all:
@echo Please read the README file before doing anything else.
@ -41,7 +40,7 @@ Index: perl-5.12.3/Cross/Makefile
perl:
@echo Perl cross-build directory is $(TOPDIR)
@echo Target arch is $(SYS)
@@ -54,11 +44,11 @@ perl:
@@ -52,11 +42,11 @@ perl:
$(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh
cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more
cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm lib/Config_heavy.pl fake_config_library

View File

@ -14,7 +14,7 @@
: Configure command line arguments.
config_arg0='Configure'
config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@DESTDIR@ -Dprefix=/usr -Dvendorprefix=/usr -Dsiteprefix=/usr -Dotherlibdirs=/usr/lib/perl5/5.12.3 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@DESTDIR@ -Dprefix=/usr -Dvendorprefix=/usr -Dsiteprefix=/usr -Dotherlibdirs=/usr/lib/perl5/5.14.2 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
config_argc=28
config_arg1='-des'
config_arg2='-Doptimize=-O2'
@ -26,7 +26,7 @@ config_arg7='-Dinstallprefix=@DESTDIR@'
config_arg8='-Dprefix=/usr'
config_arg9='-Dvendorprefix=/usr'
config_arg10='-Dsiteprefix=/usr'
config_arg11='-Dotherlibdirs=/usr/lib/perl5/5.12.3'
config_arg11='-Dotherlibdirs=/usr/lib/perl5/5.14.2'
config_arg12='-Duseshrplib'
config_arg13='-Dusethreads'
config_arg14='-Duseithreads'
@ -64,11 +64,11 @@ ansi2knr=''
aphostname=''
api_revision='5'
api_subversion='0'
api_version='12'
api_versionstring='5.12.0'
api_version='14'
api_versionstring='5.14.0'
ar='ar'
archlib='/usr/lib/perl5/5.12.3/@ARCH@-thread-multi'
archlibexp='/usr/lib/perl5/5.12.3/@ARCH@-thread-multi'
archlib='/usr/lib/perl5/5.14.2/@ARCH@-thread-multi'
archlibexp='/usr/lib/perl5/5.14.2/@ARCH@-thread-multi'
archname64=''
archname='@ARCH@-thread-multi'
archobjs=''
@ -86,7 +86,7 @@ castflags='0'
cat='cat'
cc='gcc'
cccdlflags='-fPIC'
ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.12.3/@ARCH@-thread-multi/CORE'
ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.14.2/@ARCH@-thread-multi/CORE'
ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccname='gcc'
@ -746,7 +746,7 @@ inc_version_list_init='0'
incpath=''
inews=''
initialinstalllocation='/usr/bin'
installarchlib='@DESTDIR@/lib/perl5/5.12.3/@ARCH@-thread-multi'
installarchlib='@DESTDIR@/lib/perl5/5.14.2/@ARCH@-thread-multi'
installbin='@DESTDIR@/bin'
installhtml1dir=''
installhtml3dir=''
@ -754,23 +754,23 @@ installman1dir=''
installman3dir=''
installprefix='@DESTDIR@'
installprefixexp='@DESTDIR@'
installprivlib='@DESTDIR@/lib/perl5/5.12.3'
installprivlib='@DESTDIR@/lib/perl5/5.14.2'
installscript='@DESTDIR@/bin'
installsitearch='@DESTDIR@/lib/perl5/site_perl/5.12.3/@ARCH@-thread-multi'
installsitearch='@DESTDIR@/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi'
installsitebin='@DESTDIR@/bin'
installsitehtml1dir=''
installsitehtml3dir=''
installsitelib='@DESTDIR@/lib/perl5/site_perl/5.12.3'
installsitelib='@DESTDIR@/lib/perl5/site_perl/5.14.2'
installsiteman1dir=''
installsiteman3dir=''
installsitescript='@DESTDIR@/bin'
installstyle='lib/perl5'
installusrbinperl='define'
installvendorarch='@DESTDIR@/lib/perl5/vendor_perl/5.12.3/@ARCH@-thread-multi'
installvendorarch='@DESTDIR@/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi'
installvendorbin='@DESTDIR@/bin'
installvendorhtml1dir=''
installvendorhtml3dir=''
installvendorlib='@DESTDIR@/lib/perl5/vendor_perl/5.12.3'
installvendorlib='@DESTDIR@/lib/perl5/vendor_perl/5.14.2'
installvendorman1dir=''
installvendorman3dir=''
installvendorscript='@DESTDIR@/bin'
@ -864,11 +864,11 @@ optimize='-O2'
orderlib='false'
osname='linux'
osvers='2.6.37-rc5-yocto-standard+'
otherlibdirs='/usr/lib/perl5/5.12.3'
otherlibdirs='/usr/lib/perl5/5.14.2'
package='perl5'
pager='/usr/bin/less -isr'
passcat='cat /etc/passwd'
patchlevel='12'
patchlevel='14'
path_sep=':'
perl5='/usr/bin/perl'
perl=''
@ -884,8 +884,8 @@ pmake=''
pr=''
prefix='/usr'
prefixexp='/usr'
privlib='/usr/lib/perl5/5.12.3'
privlibexp='/usr/lib/perl5/5.12.3'
privlib='/usr/lib/perl5/5.14.2'
privlibexp='/usr/lib/perl5/5.14.2'
procselfexe='"/proc/self/exe"'
prototype='define'
randbits='48'
@ -937,17 +937,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
sig_size='69'
signal_t='void'
sitearch='/usr/lib/perl5/site_perl/5.12.3/@ARCH@-thread-multi'
sitearchexp='/usr/lib/perl5/site_perl/5.12.3/@ARCH@-thread-multi'
sitearch='/usr/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi'
sitearchexp='/usr/lib/perl5/site_perl/5.14.2/@ARCH@-thread-multi'
sitebin='/usr/bin'
sitebinexp='/usr/bin'
sitehtml1dir=''
sitehtml1direxp=''
sitehtml3dir=''
sitehtml3direxp=''
sitelib='/usr/lib/perl5/site_perl/5.12.3'
sitelib='/usr/lib/perl5/site_perl/5.14.2'
sitelib_stem='/usr/lib/perl5/site_perl'
sitelibexp='/usr/lib/perl5/site_perl/5.12.3'
sitelibexp='/usr/lib/perl5/site_perl/5.14.2'
siteman1dir=''
siteman1direxp=''
siteman3dir=''
@ -1045,17 +1045,17 @@ uvtype='unsigned long'
uvuformat='"lu"'
uvxformat='"lx"'
vaproto='define'
vendorarch='/usr/lib/perl5/vendor_perl/5.12.3/@ARCH@-thread-multi'
vendorarchexp='/usr/lib/perl5/vendor_perl/5.12.3/@ARCH@-thread-multi'
vendorarch='/usr/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi'
vendorarchexp='/usr/lib/perl5/vendor_perl/5.14.2/@ARCH@-thread-multi'
vendorbin='/usr/bin'
vendorbinexp='/usr/bin'
vendorhtml1dir=' '
vendorhtml1direxp=''
vendorhtml3dir=' '
vendorhtml3direxp=''
vendorlib='/usr/lib/perl5/vendor_perl/5.12.3'
vendorlib='/usr/lib/perl5/vendor_perl/5.14.2'
vendorlib_stem='/usr/lib/perl5/vendor_perl'
vendorlibexp='/usr/lib/perl5/vendor_perl/5.12.3'
vendorlibexp='/usr/lib/perl5/vendor_perl/5.14.2'
vendorman1dir=' '
vendorman1direxp=''
vendorman3dir=' '
@ -1064,8 +1064,8 @@ vendorprefix='/usr'
vendorprefixexp='/usr'
vendorscript='/usr/bin'
vendorscriptexp='/usr/bin'
version='5.12.3'
version_patchlevel_string='version 12 subversion 2'
version='5.14.2'
version_patchlevel_string='version 14 subversion 2'
versiononly='undef'
vi=''
voidflags='15'
@ -1075,12 +1075,19 @@ yaccflags=''
zcat=''
zip='zip'
PERL_REVISION=5
PERL_VERSION=12
PERL_VERSION=14
PERL_SUBVERSION=2
PERL_API_REVISION=5
PERL_API_VERSION=12
PERL_API_VERSION=14
PERL_API_SUBVERSION=0
PERL_PATCHLEVEL=''
PERL_CONFIG_SH=true
: Variables propagated from previous config.sh file.
libdb_needs_pthread='N'
d_static_inline='define'
d_sockaddr_sa_len='undef'
d_sin6_scope_id='define'
d_prctl='define'
d_prctl_set_name='define'
perl_static_inline='static __inline__'

View File

@ -0,0 +1,15 @@
Upstream-Status:Inappropriate [embedded specific]
Index: perl-5.14.2/Makefile.SH
===================================================================
--- perl-5.14.2.orig/Makefile.SH
+++ perl-5.14.2/Makefile.SH
@@ -622,7 +622,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
$(RUN) ./generate_uudmap$(HOST_EXE_EXT) uudmap.h bitcount.h
generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
- $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs)
+ $(BUILD_CC) -o generate_uudmap$(EXE_EXT) generate_uudmap.c
miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
$(CCCMD) $(PLDLFLAGS) $*.c

View File

@ -1,15 +1,18 @@
Upstream-Status:Inappropriate [debian patch]
From f624a9f1206cdd44fde99c40d82e2f326db485dd Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sat, 1 Nov 2008 15:10:16 +0200
Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate
slower build hosts
Subject: Raise the timeout of ext/threads/shared/t/stress.t to accommodate slower build hosts
Bug-Debian: http://bugs.debian.org/501970
Patch-Name: debian/arm_thread_stress_timeout.diff
---
dist/threads-shared/t/stress.t | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
index adfd1ed..652a3e6 100755
index adfd1ed..652a3e6 100644
--- a/dist/threads-shared/t/stress.t
+++ b/dist/threads-shared/t/stress.t
@@ -34,7 +34,7 @@ use threads::shared;
@ -21,5 +24,3 @@ index adfd1ed..652a3e6 100755
my $mutex = 1;
share($mutex);
--
tg: (a508b62..) debian/arm_thread_stress_timeout (depends on: upstream)

View File

@ -1,21 +1,23 @@
Upstream-Status:Inappropriate [debian patch]
Subject: Provide a sensible INSTALLDIRS default for modules installed from CPAN.
From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Provide a sensible INSTALLDIRS default for modules installed from
CPAN.
Some modules which are included in core set INSTALLDIRS => 'perl'
explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC
ordering, but not ours.
Patch-Name: debian/cpan_definstalldirs.diff
---
cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
index 53ffbf1..53976ff 100644
index 667bdca..c38c890 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
@@ -947,7 +947,7 @@ sub init {
@@ -990,7 +990,7 @@ sub init {
my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
@ -24,7 +26,7 @@ index 53ffbf1..53976ff 100644
my_dflt_prompt(make_arg => "", $matcher);
if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
$CPAN::Frontend->mywarn(
@@ -969,7 +969,7 @@ sub init {
@@ -1022,7 +1022,7 @@ sub init {
my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
$matcher);
@ -33,5 +35,3 @@ index 53ffbf1..53976ff 100644
my_dflt_prompt(mbuild_arg => "", $matcher);
if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}
--
tg: (a508b62..) debian/cpan_definstalldirs (depends on: upstream)

View File

@ -1,25 +1,26 @@
Upstream-Status:Inappropriate [debian patch]
From 9825086b15f34f365a272cc8d6caf4e2044bede6 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Mon, 6 Jul 2009 22:17:53 +0300
Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
This is a configuration file and needs to go in /etc by policy.
Besides, /usr may not even be writable.
This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path.
See #533707.
Patch-Name: debian/cpanplus_config_path.diff
---
cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | 1 +
cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
index baac91d..a3794de 100644
index ba1ca07..25cbe5f 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
@@ -276,6 +276,7 @@ Saves the configuration to the package name you provided.
@@ -280,6 +280,7 @@ Saves the configuration to the package name you provided.
If this package is not C<CPANPLUS::Config::System>, it will
be saved in your C<.cpanplus> directory, otherwise it will
be attempted to be saved in the system wide directory.
@ -28,10 +29,10 @@ index baac91d..a3794de 100644
If no argument is provided, it will default to your personal
config.
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
index 1a38200..6ee0d82 100644
index 443d5a4..f7085a8 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
@@ -199,6 +199,9 @@ use constant CONFIG_USER_FILE => sub {
@@ -209,6 +209,9 @@ use constant CONFIG_USER_FILE => sub {
) . '.pm';
};
use constant CONFIG_SYSTEM_FILE => sub {
@ -41,5 +42,3 @@ index 1a38200..6ee0d82 100644
require CPANPLUS::Internals;
require File::Basename;
my $dir = File::Basename::dirname(
--
tg: (a508b62..) debian/cpanplus_config_path (depends on: upstream)

View File

@ -1,18 +1,21 @@
Upstream-Status:Inappropriate [debian patch]
From 66517b14790aa6410fd37e411dd62521e1e02b7f Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Mon, 6 Jul 2009 21:58:41 +0300
Subject: Configure CPANPLUS to use the site directories by default.
Closes: 533707
Bug-Debian: http://bugs.debian.org/533707
The core modules usually default to INSTALLDIRS=perl (ExtUtils::MakeMaker)
or installdirs=core (Module::Build), so we need to explicitly ask for
the site destination to get upgraded versions into /usr/local.
See also the sister patch, debian/cpan_definstalldirs .
Patch-Name: debian/cpanplus_definstalldirs.diff
---
cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm | 30 +++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
create mode 100644 cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm b/cpan/CPANPLUS/lib/CPANPLUS/Config/System.pm
new file mode 100644
@ -50,5 +53,3 @@ index 0000000..5e6e11e
+}
+
+1;
--
tg: (a508b62..) debian/cpanplus_definstalldirs (depends on: upstream)

View File

@ -1,17 +1,19 @@
Upstream-Status:Inappropriate [debian patch]
From 0d1acf7af6da3a3f933faba8459ad9ff03fe3e5b Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 16 Dec 2005 01:32:14 +1100
Subject: Remove overly restrictive DB_File version check.
Bug-Debian: http://bugs.debian.org/340047
Package dependencies ensure the correct library is linked at run-time.
Patch-Name: debian/db_file_ver.diff
---
cpan/DB_File/version.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c
index 47158d3..67ccdff 100644
index e01f6f6..544e6ee 100644
--- a/cpan/DB_File/version.c
+++ b/cpan/DB_File/version.c
@@ -48,6 +48,7 @@ __getBerkeleyDBInfo()
@ -30,5 +32,3 @@ index 47158d3..67ccdff 100644
/* check that libdb is recent enough -- we need 2.3.4 or greater */
if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4)))
--
tg: (a508b62..) debian/db_file_ver (depends on: upstream)

View File

@ -0,0 +1,406 @@
From c2bd2059cfbba573643c748ace4ff4db4cbf015d Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Mon, 17 May 2010 13:23:07 +0300
Subject: Point users to Debian packages of deprecated core modules
Bug-Debian: http://bugs.debian.org/580034
Class::ISA, Switch, Pod::Plainer, and (partially) Shell were
deprecated from the Perl core in 5.12.0.
Class::ISA, Switch, Pod::Plainer were removed from the Perl core in
5.14.0.
Shell and Devel::DProf, and Perl 4 libraries, were deprecated from the
Perl core in 5.14.0.
To get a clean transition, perl/perl-modules is going to recommend the
separate Debian packages of these for one release cycle so that they will be
pulled in by default on upgrades.
However, on systems configured to ignore recommendations the deprecation
warnings will still be useful, so modify them slightly to point to the
separate packages instead.
Patch-Name: debian/deprecate-with-apt.diff
---
lib/abbrev.pl | 2 +-
lib/assert.pl | 2 +-
lib/bigfloat.pl | 2 +-
lib/bigint.pl | 2 +-
lib/bigrat.pl | 2 +-
lib/cacheout.pl | 2 +-
lib/complete.pl | 2 +-
lib/ctime.pl | 2 +-
lib/deprecate.pm | 16 +++++++++++++++-
lib/dotsh.pl | 2 +-
lib/exceptions.pl | 2 +-
lib/fastcwd.pl | 2 +-
lib/find.pl | 2 +-
lib/finddepth.pl | 2 +-
lib/flush.pl | 2 +-
lib/getcwd.pl | 2 +-
lib/getopt.pl | 2 +-
lib/getopts.pl | 2 +-
lib/hostname.pl | 2 +-
lib/importenv.pl | 2 +-
lib/look.pl | 2 +-
lib/newgetopt.pl | 2 +-
lib/open2.pl | 2 +-
lib/open3.pl | 2 +-
lib/pwd.pl | 2 +-
lib/shellwords.pl | 2 +-
lib/stat.pl | 2 +-
lib/syslog.pl | 2 +-
lib/tainted.pl | 2 +-
lib/termcap.pl | 2 +-
lib/timelocal.pl | 2 +-
lib/validate.pl | 2 +-
32 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/lib/abbrev.pl b/lib/abbrev.pl
index d46321f..0168631 100644
--- a/lib/abbrev.pl
+++ b/lib/abbrev.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# Usage:
;# %foo = ();
diff --git a/lib/assert.pl b/lib/assert.pl
index d47e006..80593c5 100644
--- a/lib/assert.pl
+++ b/lib/assert.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
#
# This library is no longer being maintained, and is included for backward
diff --git a/lib/bigfloat.pl b/lib/bigfloat.pl
index 82d0f5c..c21bac6 100644
--- a/lib/bigfloat.pl
+++ b/lib/bigfloat.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
package bigfloat;
require "bigint.pl";
diff --git a/lib/bigint.pl b/lib/bigint.pl
index 6de1c53..031e8ad 100644
--- a/lib/bigint.pl
+++ b/lib/bigint.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
package bigint;
#
diff --git a/lib/bigrat.pl b/lib/bigrat.pl
index aaf1713..146a8f4 100644
--- a/lib/bigrat.pl
+++ b/lib/bigrat.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
package bigrat;
require "bigint.pl";
diff --git a/lib/cacheout.pl b/lib/cacheout.pl
index a5da453..937405d 100644
--- a/lib/cacheout.pl
+++ b/lib/cacheout.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
#
# This library is no longer being maintained, and is included for backward
diff --git a/lib/complete.pl b/lib/complete.pl
index 9ed041c..2ab0c6a 100644
--- a/lib/complete.pl
+++ b/lib/complete.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;#
#
diff --git a/lib/ctime.pl b/lib/ctime.pl
index aa00d00..ac24e71 100644
--- a/lib/ctime.pl
+++ b/lib/ctime.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# ctime.pl is a simple Perl emulation for the well known ctime(3C) function.
#
diff --git a/lib/deprecate.pm b/lib/deprecate.pm
index 7562c69..fc548b0 100644
--- a/lib/deprecate.pm
+++ b/lib/deprecate.pm
@@ -7,6 +7,14 @@ our $VERSION = 0.02;
our %Config;
unless (%Config) { require Config; *Config = \%Config::Config; }
+# Debian-specific change: recommend the separate Debian packages of
+# deprecated modules where available
+
+my %DEBIAN_PACKAGES = (
+ "Shell" => "libshell-perl",
+ "Devel::DProf" => "libdevel-dprof-perl"
+);
+
# This isn't a public API. It's internal to code maintained by the perl-porters
# If you would like it to be a public API, please send a patch with
# documentation and tests. Until then, it may change without warning.
@@ -58,9 +66,15 @@ EOM
if (defined $callers_bitmask
&& (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1)
|| vec($callers_bitmask, $warnings::Offsets{all}, 1))) {
- warn <<"EOM";
+ if (my $deb = $DEBIAN_PACKAGES{$package}) {
+ warn <<"EOM";
+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line.
+EOM
+ } else {
+ warn <<"EOM";
$package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line.
EOM
+ }
}
}
}
diff --git a/lib/dotsh.pl b/lib/dotsh.pl
index 92f1f4c..4085122 100644
--- a/lib/dotsh.pl
+++ b/lib/dotsh.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
#
# @(#)dotsh.pl 03/19/94
diff --git a/lib/exceptions.pl b/lib/exceptions.pl
index 8af64c8..b5b1427 100644
--- a/lib/exceptions.pl
+++ b/lib/exceptions.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# exceptions.pl
# tchrist@convex.com
diff --git a/lib/fastcwd.pl b/lib/fastcwd.pl
index 70007a1..2c7c42e 100644
--- a/lib/fastcwd.pl
+++ b/lib/fastcwd.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# By John Bazik
#
diff --git a/lib/find.pl b/lib/find.pl
index 8e1b42c..7fb2fbf 100644
--- a/lib/find.pl
+++ b/lib/find.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This library is deprecated and unmaintained. It is included for
# compatibility with Perl 4 scripts which may use it, but it will be
diff --git a/lib/finddepth.pl b/lib/finddepth.pl
index 479905f..c07cea5 100644
--- a/lib/finddepth.pl
+++ b/lib/finddepth.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This library is deprecated and unmaintained. It is included for
# compatibility with Perl 4 scripts which may use it, but it will be
diff --git a/lib/flush.pl b/lib/flush.pl
index c427976..e5ed0ae 100644
--- a/lib/flush.pl
+++ b/lib/flush.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
#
# This library is no longer being maintained, and is included for backward
diff --git a/lib/getcwd.pl b/lib/getcwd.pl
index 77b2442..3810a99 100644
--- a/lib/getcwd.pl
+++ b/lib/getcwd.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# By Brandon S. Allbery
#
diff --git a/lib/getopt.pl b/lib/getopt.pl
index 1d4008a..019a165 100644
--- a/lib/getopt.pl
+++ b/lib/getopt.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $
#
diff --git a/lib/getopts.pl b/lib/getopts.pl
index 37ecb4a..3d27418 100644
--- a/lib/getopts.pl
+++ b/lib/getopts.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# getopts.pl - a better getopt.pl
#
diff --git a/lib/hostname.pl b/lib/hostname.pl
index f57375e..b055d30 100644
--- a/lib/hostname.pl
+++ b/lib/hostname.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# From: asherman@fmrco.com (Aaron Sherman)
#
diff --git a/lib/importenv.pl b/lib/importenv.pl
index 625edf6..52ee722 100644
--- a/lib/importenv.pl
+++ b/lib/importenv.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This library is no longer being maintained, and is included for backward
# compatibility with Perl 4 programs which may require it.
diff --git a/lib/look.pl b/lib/look.pl
index 7be55b2..12dcace 100644
--- a/lib/look.pl
+++ b/lib/look.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# Usage: &look(*FILEHANDLE,$key,$dict,$fold)
#
diff --git a/lib/newgetopt.pl b/lib/newgetopt.pl
index 4ac9470..08df6cb 100644
--- a/lib/newgetopt.pl
+++ b/lib/newgetopt.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This library is no longer being maintained, and is included for backward
# compatibility with Perl 4 programs which may require it.
diff --git a/lib/open2.pl b/lib/open2.pl
index ceb5653..a05f2ab 100644
--- a/lib/open2.pl
+++ b/lib/open2.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This legacy library is deprecated and will be removed in a future
# release of perl.
diff --git a/lib/open3.pl b/lib/open3.pl
index 9f4d5a4..27f7ab4 100644
--- a/lib/open3.pl
+++ b/lib/open3.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This legacy library is deprecated and will be removed in a future
# release of perl.
diff --git a/lib/pwd.pl b/lib/pwd.pl
index bd8123b..bdace6e 100644
--- a/lib/pwd.pl
+++ b/lib/pwd.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# pwd.pl - keeps track of current working directory in PWD environment var
;#
diff --git a/lib/shellwords.pl b/lib/shellwords.pl
index b562f5f..7f16375 100644
--- a/lib/shellwords.pl
+++ b/lib/shellwords.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# This legacy library is deprecated and will be removed in a future
;# release of perl.
diff --git a/lib/stat.pl b/lib/stat.pl
index feda273..910ce1c 100644
--- a/lib/stat.pl
+++ b/lib/stat.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# This legacy library is deprecated and will be removed in a future
;# release of perl.
diff --git a/lib/syslog.pl b/lib/syslog.pl
index 7504a5d..4c2b95f 100644
--- a/lib/syslog.pl
+++ b/lib/syslog.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
#
# syslog.pl
diff --git a/lib/tainted.pl b/lib/tainted.pl
index e88bca1..d58c765 100644
--- a/lib/tainted.pl
+++ b/lib/tainted.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
# This legacy library is deprecated and will be removed in a future
# release of perl.
diff --git a/lib/termcap.pl b/lib/termcap.pl
index a84cba3..e641f4d 100644
--- a/lib/termcap.pl
+++ b/lib/termcap.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# $RCSfile: termcap.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:16 $
#
diff --git a/lib/timelocal.pl b/lib/timelocal.pl
index fefb9da..2297888 100644
--- a/lib/timelocal.pl
+++ b/lib/timelocal.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# timelocal.pl
;#
diff --git a/lib/validate.pl b/lib/validate.pl
index fc2d16a..1a8aef4 100644
--- a/lib/validate.pl
+++ b/lib/validate.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
;# The validate routine takes a single multiline string consisting of
;# lines containing a filename plus a file test to try on it. (The

View File

@ -1,11 +1,12 @@
Upstream-Status:Inappropriate [debian patch]
From 90c7967530102c66bbff25d89273d3f0bf189a83 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Fri, 10 Apr 2009 01:17:43 +0300
Subject: Disable zlib bundling in Compress::Raw::Zlib
Compress::Raw::Zlib statically links its bundled version of zlib
by default, but we use the system library instead.
Patch-Name: debian/disable-zlib-bundling.diff
---
cpan/Compress-Raw-Zlib/config.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
@ -27,5 +28,3 @@ index c56cc03..2c6659b 100644
OLD_ZLIB = False
GZIP_OS_CODE = AUTO_DETECT
--
tg: (a508b62..) debian/disable-zlib-bundling (depends on: upstream)

View File

@ -1,19 +1,21 @@
Upstream-Status:Inappropriate [debian patch]
Subject: Replace generic man(1) instructions with Debian-specific information.
From 16ebe1f5232621d8894aa6c6210fdf2fc9b54a84 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
Subject: Replace generic man(1) instructions with Debian-specific
information.
Indicate that the user needs to install the perl-doc package.
Patch-Name: debian/doc_info.diff
---
pod/perl.pod | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pod/perl.pod b/pod/perl.pod
index e67f062..3b8ae83 100644
index 29cabf1..529ad6f 100644
--- a/pod/perl.pod
+++ b/pod/perl.pod
@@ -242,8 +242,16 @@ For ease of access, the Perl manual has been split up into several sections.
@@ -261,8 +261,16 @@ For ease of access, the Perl manual has been split up into several sections.
perlwin32 Perl notes for Windows
@ -32,5 +34,3 @@ index e67f062..3b8ae83 100644
In general, if something strange has gone wrong with your program and you're
not sure where you should look for help, try the B<-w> switch first. It will
--
tg: (a508b62..) debian/doc_info (depends on: upstream)

View File

@ -1,6 +1,8 @@
Upstream-Status:Inappropriate [debian patch]
From e9fd6e7729b9ebd9bc74b8cf295cd3a7f5aa5472 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
Bug-Debian: http://bugs.debian.org/290336
- ignore missing directories,
@ -8,6 +10,7 @@ Bug-Debian: http://bugs.debian.org/290336
- filter "." out when running "enc2xs -C", it's unnecessary and causes
issues with follow => 1 (see #603686 and [rt.cpan.org #64585])
Patch-Name: debian/enc2xs_inc.diff
---
cpan/Encode/bin/enc2xs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
@ -48,5 +51,3 @@ index 773c0a0..bc1ae1b 100644
$_ModLines = "";
for my $enc ( sort keys %LocalMod ) {
$_ModLines .=
--
tg: (a508b62..) debian/enc2xs_inc (depends on: upstream)

View File

@ -1,25 +1,28 @@
Upstream-Status:Inappropriate [debian patch]
From 973bed42db538804179f39d66dab37c82c6ade24 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 16 Dec 2005 01:32:14 +1100
Subject: Remove Errno version check due to upgrade problems with long-running
processes.
Subject: Remove Errno version check due to upgrade problems with long-running processes.
Bug-Debian: http://bugs.debian.org/343351
Remove version check which can cause problems for long running
processes embedding perl when upgrading to a newer version,
compatible, but built on a different machine.
Patch-Name: debian/errno_ver.diff
---
ext/Errno/Errno_pm.PL | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
index 124b8fc..b554cd4 100644
index 56bc815..01f510a 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -341,13 +341,8 @@ EOF
@@ -332,13 +332,8 @@ EOF
package Errno;
our (\@EXPORT_OK,\%EXPORT_TAGS,\@ISA,\$VERSION,\%errno,\$AUTOLOAD);
use Exporter ();
require Exporter;
-use Config;
use strict;
@ -27,8 +30,6 @@ index 124b8fc..b554cd4 100644
-"$Config{'archname'}-$Config{'osvers'}" or
- die "Errno architecture ($Config{'archname'}-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
-
\$VERSION = "$VERSION";
our \$VERSION = "$VERSION";
\$VERSION = eval \$VERSION;
\@ISA = qw(Exporter);
--
tg: (a508b62..) debian/errno_ver (depends on: upstream)
our \@ISA = 'Exporter';

View File

@ -0,0 +1,23 @@
From 334ac01a8306485ed901f4fb45d79f39a944fe77 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: EU:MM: Set location of libperl.a to /usr/lib
Patch-Name: debian/extutils_set_libperl_path.diff
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 4ee6b3f..42bbb83 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2409,7 +2409,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
}
unless ($libperl && -f $lperl) { # Ilya's code...
- my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
+ my $dir = $self->{PERL_SRC} || "/usr/lib";
$dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
$libperl ||= "libperl$self->{LIB_EXT}";
$libperl = "$dir/$libperl";

View File

@ -1,5 +1,6 @@
Upstream-Status:Inappropriate [debian patch]
From a46a7107fb045ffa6047488b8002fec97b621a11 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
Subject: Postpone LD_LIBRARY_PATH evaluation to the binary targets.
Modify the setting of LD_LIBRARY_PATH to append pre-existing values at the
@ -9,16 +10,16 @@ This is required when building packages with dpkg-buildpackage and fakeroot,
since fakeroot (which now sets LD_LIBRARY_PATH) is not used for the "build"
rule where the Makefile is created, but is for the clean/binary* targets.
Patch-Name: debian/fakeroot.diff
---
Makefile.SH | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Makefile.SH b/Makefile.SH
index fc13b2b..d420229 100755
index eb6326a..1dac585 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -50,12 +50,7 @@ case "$useshrplib" in
@@ -36,12 +36,7 @@ case "$useshrplib" in
true)
# Prefix all runs of 'miniperl' and 'perl' with
# $ldlibpth so that ./perl finds *this* shared libperl.
@ -32,7 +33,7 @@ index fc13b2b..d420229 100755
pldlflags="$cccdlflags"
static_ldflags=''
@@ -126,7 +121,7 @@ true)
@@ -112,7 +107,7 @@ true)
;;
esac
case "$ldlibpthname" in
@ -41,5 +42,3 @@ index fc13b2b..d420229 100755
*)
case "$osname" in
os2)
--
tg: (a508b62..) debian/fakeroot (depends on: upstream)

View File

@ -0,0 +1,35 @@
From ca66b95be369b47a6d372c3653be57cd737f7f21 Mon Sep 17 00:00:00 2001
From: Andreas Marschke <andreas.marschke@googlemail.com>
Date: Sat, 17 Sep 2011 11:38:42 +0100
Subject: Configure CPAN::Distribution with correct name of html2text
Bug-Debian: http://bugs.debian.org/640479
Patch-Name: debian/find_html2text.diff
If you use cpan from Debian you usually wind up trying to read online
documentation through it. Unfortunately cpan can't find the
html2text.pl script even though it is installed using the Debian
package 'html2text'.
Please see the attached patch for a quick fix of this issue.
[Maintainer's note: html2text in Debian is not the same implementation
as the html2text.pl which is expected, but should provide similar
functionality].
---
cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
index 637ab27..a8193d9 100644
--- a/cpan/CPAN/lib/CPAN/Distribution.pm
+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
@@ -3715,7 +3715,7 @@ sub _display_url {
if $CPAN::DEBUG;
# should we define it in the config instead?
- my $html_converter = "html2text.pl";
+ my $html_converter = "html2text";
my $web_browser = $CPAN::Config->{'lynx'} || undef;
my $web_browser_out = $web_browser

View File

@ -0,0 +1,31 @@
From f0e3a51bd7286788e410510af86a6c07edac4445 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Mon, 30 May 2011 22:54:24 +0300
Subject: Document that CCFLAGS should include $Config{ccflags}
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613
Bug-Debian: http://bugs.debian.org/628522
Compiling XS extensions without $Config{ccflags} can break the
binary interface on some platforms.
Patch-Name: fixes/document_makemaker_ccflags.diff
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
index be9624e..c56ca8f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
@@ -1524,6 +1524,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
String that will be included in the compiler call command line between
the arguments INC and OPTIMIZE.
+The default value is taken from $Config{ccflags}. When overriding
+CCFLAGS, make sure to include the $Config{ccflags} settings to avoid
+binary incompatibilities.
+
=item CONFIG
Arrayref. E.g. [qw(archname manext)] defines ARCHNAME & MANEXT from

View File

@ -0,0 +1,86 @@
From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Thu, 28 Apr 2011 09:18:54 +0300
Subject: Append CFLAGS and LDFLAGS to their Config.pm counterparts in
EU::CBuilder
Bug: http://rt.perl.org/rt3//Public/Bug/Display.html?id=89478
Bug-Debian: http://bugs.debian.org/624460
Origin: upstream, http://perl5.git.perl.org/perl.git/commitdiff/011e8fb476b5fb27c9aa613360d918aa0b798b3d
Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
CFLAGS and LDFLAGS from the environment have overridden the Config.pm
ccflags and ldflags settings. This can cause binary incompatibilities
between the core Perl and extensions built with EU::CBuilder.
Append to the Config.pm values rather than overriding them.
Patch-Name: fixes/extutils-cbuilder-cflags.diff
---
.../lib/ExtUtils/CBuilder/Base.pm | 6 +++-
dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
index b572312..2255c51 100644
--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
@@ -40,11 +40,13 @@ sub new {
$self->{config}{$k} = $v unless exists $self->{config}{$k};
}
$self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
+ if defined $ENV{CFLAGS};
$self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
$self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
$self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
+ if defined $ENV{LDFLAGS};
unless ( exists $self->{config}{cxx} ) {
my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
index db0ef98..49819a1 100644
--- a/dist/ExtUtils-CBuilder/t/04-base.t
+++ b/dist/ExtUtils-CBuilder/t/04-base.t
@@ -1,7 +1,7 @@
#! perl -w
use strict;
-use Test::More tests => 50;
+use Test::More tests => 64;
use Config;
use Cwd;
use File::Path qw( mkpath );
@@ -328,6 +328,29 @@ is_deeply( $mksymlists_args,
"_prepare_mksymlists_args(): got expected arguments for Mksymlists",
);
+my %testvars = (
+ CFLAGS => 'ccflags',
+ LDFLAGS => 'ldflags',
+);
+
+while (my ($VAR, $var) = each %testvars) {
+ local $ENV{$VAR};
+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
+ isa_ok( $base, 'ExtUtils::CBuilder::Base' );
+ like($base->{config}{$var}, qr/\Q$Config{$var}/,
+ "honours $var from Config.pm");
+
+ $ENV{$VAR} = "-foo -bar";
+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
+ isa_ok( $base, 'ExtUtils::CBuilder::Base' );
+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
+ "honours $VAR from the environment");
+ like($base->{config}{$var}, qr/\Q$Config{$var}/,
+ "doesn't override $var from Config.pm with $VAR from the environment");
+}
+
#####
for ($source_file, $object_file, $lib_file) {

View File

@ -0,0 +1,69 @@
From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Wed, 18 May 2011 21:44:06 -0700
Subject: Make h2ph correctly search gcc include directories
Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=90122
Bug-Debian: http://bugs.debian.org/625808
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/e7ec705d9b91d35fa99dc50d0a232b6372160a77
System header conversion with "h2ph -a" is currently broken on Ubuntu
Natty and Oneiric (unless the gcc-multilib package is installed for
backward compatibility), resulting in things like
# perl -e 'require "syscall.ph"'
Can't locate asm/unistd.ph in @INC [...]
This happens because Ubuntu has switched to a 'multiarch' setup, see
<https://wiki.ubuntu.com/MultiarchSpec> for details.
The asm subdirectory isn't in $Config{usrinc} anymore: /usr/include/asm
is now /usr/include/x86_64-linux-gnu/asm. (The third component of the
new path varies with the actual architecture.)
gcc --print-search-dirs doesn't really tell anything about where gcc
looks for the include directories, it was just used to find the gcc
internal directory prefix.
Parse the output of "gcc -v -E" instead, and append $Config{usrinc}
for safety. Duplicates shouldn't matter.
The h2ph "-a" switch isn't currently tested automatically, and that
seems nontrivial to do portably. Manual testing was done with
# mkdir ttt
# ./perl -Ilib ./utils/h2ph -a -d $(pwd)/ttt syscall.h
The gcc invocation has been tested to work with gcc 4.6, 4.1, and 3.3.
http://bugs.debian.org/625808
https://bugs.launchpad.net/bugs/777903
Patch-Name: fixes/h2ph-multiarch.diff
---
utils/h2ph.PL | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 87f3c7d..4545d6d 100644
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -761,16 +761,8 @@ sub queue_includes_from
# non-GCC?) C compilers, but gcc uses additional include directories.
sub inc_dirs
{
- my $from_gcc = `LC_ALL=C $Config{cc} -v 2>&1`;
- if( !( $from_gcc =~ s:^Reading specs from (.*?)/specs\b.*:$1/include:s ) )
- { # gcc-4+ :
- $from_gcc = `LC_ALL=C $Config{cc} -print-search-dirs 2>&1`;
- if ( !($from_gcc =~ s/^install:\s*([^\s]+[^\s\/])([\s\/]*).*$/$1\/include/s) )
- {
- $from_gcc = '';
- };
- };
- length($from_gcc) ? ($from_gcc, $from_gcc . "-fixed", $Config{usrinc}) : ($Config{usrinc});
+ my $from_gcc = `LC_ALL=C $Config{cc} -v -E - < /dev/null 2>&1 | awk '/^#include/, /^End of search list/' | grep '^ '`;
+ length($from_gcc) ? (split(' ', $from_gcc), $Config{usrinc}) : ($Config{usrinc});
}

View File

@ -1,12 +1,16 @@
Upstream-Status:Inappropriate [debian patch]
Author: Samuel Thibault <sthibault@debian.org>
From f66e8575cb0ca11171f43efe0f9e3c6e790b75bc Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Wed, 4 Aug 2010 13:34:05 +0300
Subject: Make hints/gnu.sh append to $ccflags rather than overriding them
Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=92244
Bug-Debian: http://bugs.debian.org/587901
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/a190e648879
Don't override possible extra $ccflags values given to Configure
on GNU/Hurd.
Patch-Name: fixes/hurd-ccflags.diff
---
hints/gnu.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
@ -24,5 +28,3 @@ index 2cfce54..c1ba2db 100644
# The following routines are only available as stubs in GNU libc.
# XXX remove this once metaconf detects the GNU libc stubs.
--
tg: (a508b62..) fixes/hurd-ccflags (depends on: upstream)

View File

@ -0,0 +1,48 @@
From d6fd7595fcd04b332e7449f59ea298639f10a183 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Wed, 10 Aug 2011 08:11:33 +0300
Subject: Improve general GNU hints, needed for GNU/Hurd.
Bug-Debian: http://bugs.debian.org/636609
Patch-Name: fixes/hurd-hints.diff
---
ext/ODBM_File/hints/gnu.pl | 1 +
hints/gnu.sh | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 ext/ODBM_File/hints/gnu.pl
diff --git a/ext/ODBM_File/hints/gnu.pl b/ext/ODBM_File/hints/gnu.pl
new file mode 100644
index 0000000..db63567
--- /dev/null
+++ b/ext/ODBM_File/hints/gnu.pl
@@ -0,0 +1 @@
+do './hints/linux.pl' or die $@;
diff --git a/hints/gnu.sh b/hints/gnu.sh
index c1ba2db..f075642 100644
--- a/hints/gnu.sh
+++ b/hints/gnu.sh
@@ -8,10 +8,22 @@ set `echo X "$libswanted "| sed -e 's/ nsl / /' -e 's/ c / pthread /'`
shift
libswanted="$*"
+# Debian 4.0 puts ndbm in the -lgdbm_compat library.
+libswanted="$libswanted gdbm_compat"
+
case "$optimize" in
'') optimize='-O2' ;;
esac
+case "$plibpth" in
+'') plibpth=`gcc -print-search-dirs | grep libraries |
+ cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
+ set X $plibpth # Collapse all entries on one line
+ shift
+ plibpth="$*"
+ ;;
+esac
+
# Flags needed to produce shared libraries.
lddlflags='-shared'

View File

@ -0,0 +1,73 @@
From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001
From: David Mitchell <davem@iabyn.com>
Date: Tue, 28 Jun 2011 17:04:40 +0100
Subject: RT 64804: tainting with index() of a constant
Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=64804
Bug-Debian: http://bugs.debian.org/291450
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/3b36395d31cf0a2f3a017505cd0ea857a7acb5d1
At compile time, ck_index with a tainted constant set PL_tainted,
which remained on during the rest of compilation, tainting all other
constants.
Fix this by saving and restoring PL_tainted across the call to
fbm_compile, which is what sets PL_tainted.
Patch-Name: fixes/index-tainting.diff
---
op.c | 5 ++++-
t/op/taint.t | 16 +++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/op.c b/op.c
index e21b9a4..973df13 100644
--- a/op.c
+++ b/op.c
@@ -7780,8 +7780,11 @@ Perl_ck_index(pTHX_ OP *o)
OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */
if (kid)
kid = kid->op_sibling; /* get past "big" */
- if (kid && kid->op_type == OP_CONST)
+ if (kid && kid->op_type == OP_CONST) {
+ const bool save_taint = PL_tainted;
fbm_compile(((SVOP*)kid)->op_sv, 0);
+ PL_tainted = save_taint;
+ }
}
return ck_fun(o);
}
diff --git a/t/op/taint.t b/t/op/taint.t
index 9df6fee..a300b9b 100644
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -17,7 +17,7 @@ BEGIN {
use strict;
use Config;
-plan tests => 774;
+plan tests => 778;
$| = 1;
@@ -2144,6 +2144,20 @@ end
is_tainted $dest, "ucfirst(tainted) taints its return value";
}
+
+# tainted constants and index()
+# RT 64804; http://bugs.debian.org/291450
+{
+ ok(tainted $old_env_path, "initial taintedness");
+ BEGIN { no strict 'refs'; my $v = $old_env_path; *{"::C"} = sub () { $v }; }
+ ok(tainted C, "constant is tainted properly");
+ ok(!tainted "", "tainting not broken yet");
+ index(undef, C);
+ ok(!tainted "", "tainting still works after index() of the constant");
+}
+
+
+
# This may bomb out with the alarm signal so keep it last
SKIP: {
skip "No alarm()" unless $Config{d_alarm};

View File

@ -0,0 +1,37 @@
From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Mon, 2 May 2011 10:35:04 +0100
Subject: Fix failing tilde test when run under a UID without a passwd entry
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=67893
Bug-Debian: http://bugs.debian.org/624850
Patch-Name: fixes/module-build-home-directory.diff
---
cpan/Module-Build/t/tilde.t | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cpan/Module-Build/t/tilde.t b/cpan/Module-Build/t/tilde.t
index fac821b..04f0210 100644
--- a/cpan/Module-Build/t/tilde.t
+++ b/cpan/Module-Build/t/tilde.t
@@ -46,7 +46,8 @@ SKIP: {
unless (defined $home) {
my @info = eval { getpwuid $> };
- skip "No home directory for tilde-expansion tests", 15 if $@;
+ skip "No home directory for tilde-expansion tests", 15 if $@
+ or !defined $info[7];
$home = $info[7];
}
@@ -95,7 +96,8 @@ SKIP: {
# Again, with named users
SKIP: {
my @info = eval { getpwuid $> };
- skip "No home directory for tilde-expansion tests", 1 if $@;
+ skip "No home directory for tilde-expansion tests", 1 if $@
+ or !defined $info[7] or !defined $info[0];
my ($me, $home) = @info[0,7];
my $expected = "$home/fooxzy";

View File

@ -1,10 +1,12 @@
Upstream-Status:Inappropriate [debian patch]
From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Thu, 20 Sep 2007 19:47:14 +1000
Subject: Document the Net::SMTP 'Port' option
Bug-Debian: http://bugs.debian.org/100195
Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
Patch-Name: fixes/net_smtp_docs.diff
---
cpan/libnet/Net/SMTP.pm | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
@ -21,5 +23,3 @@ index a28496d..07b2498 100644
Example:
--
tg: (a508b62..) fixes/net_smtp_docs (depends on: upstream)

View File

@ -0,0 +1,145 @@
From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001
From: Keith Thompson <kst@mib.org>
Date: Fri, 29 Jul 2011 17:17:00 -0700
Subject: Fix typos in several pod/perl*.pod files
Bug-Debian: http://bugs.debian.org/637816
Origin: http://perl5.git.perl.org/perl.git/commit/7698aede74509727f7bca31c58fc7a53b182315d
Patch-Name: fixes/pod_fixes.diff
---
pod/perlfunc.pod | 8 ++++----
pod/perlglossary.pod | 10 +++++-----
pod/perlmod.pod | 4 ++--
pod/perlretut.pod | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 2ee3637..719a740 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -3918,7 +3918,7 @@ count. A numeric repeat count may optionally be enclosed in brackets, as
in C<pack("C[80]", @arr)>. The repeat count gobbles that many values from
the LIST when used with all format types other than C<a>, C<A>, C<Z>, C<b>,
C<B>, C<h>, C<H>, C<@>, C<.>, C<x>, C<X>, and C<P>, where it means
-something else, dscribed below. Supplying a C<*> for the repeat count
+something else, described below. Supplying a C<*> for the repeat count
instead of a number means to use however many items are left, except for:
=over
@@ -5870,7 +5870,7 @@ sometimes saying the opposite, for example) the results are not
well-defined.
Because C<< <=> >> returns C<undef> when either operand is C<NaN>
-(not-a-number), and laso because C<sort> raises an exception unless the
+(not-a-number), and also because C<sort> raises an exception unless the
result of a comparison is defined, be careful when sorting with a
comparison function like C<< $a <=> $b >> any lists that might contain a
C<NaN>. The following example takes advantage that C<NaN != NaN> to
@@ -5958,7 +5958,7 @@ specified.
A pattern matching the empty string (not to be confused with
an empty pattern C<//>, which is just one member of the set of patterns
-matching the epmty string), splits EXPR into individual
+matching the empty string), splits EXPR into individual
characters. For example:
print join(':', split(/ */, 'hi there')), "\n";
@@ -6222,7 +6222,7 @@ For example:
printf '<%.1e>', 10; # prints "<1.0e+01>"
For "g" and "G", this specifies the maximum number of digits to show,
-including thoe prior to the decimal point and those after it; for
+including those prior to the decimal point and those after it; for
example:
# These examples are subject to system-specific variation.
diff --git a/pod/perlglossary.pod b/pod/perlglossary.pod
index 639ce33..191371c 100644
--- a/pod/perlglossary.pod
+++ b/pod/perlglossary.pod
@@ -507,7 +507,7 @@ the class (its L<objects|/object>). See also L</inheritance>.
=item class method
-A L</method> whose L</invocand> is a L</package> name, not an
+A L</method> whose L</invocant> is a L</package> name, not an
L</object> reference. A method associated with the class as a whole.
=item client
@@ -1470,7 +1470,7 @@ Perl, C<print STDOUT "$foo\n";> can be understood as "verb
indirect-object object" where L</STDOUT> is the recipient of the
L<print|perlfunc/print> action, and C<"$foo"> is the object being
printed. Similarly, when invoking a L</method>, you might place the
-invocand between the method and its arguments:
+invocant between the method and its arguments:
$gollum = new Pathetic::Creature "Smeagol";
give $gollum "Fisssssh!";
@@ -1548,11 +1548,11 @@ of compiler that takes a program and turns it into a more executable
form (L<syntax trees|/syntax tree>) within the I<perl> process itself,
which the Perl L</run time> system then interprets.
-=item invocand
+=item invocant
The agent on whose behalf a L</method> is invoked. In a L</class>
-method, the invocand is a package name. In an L</instance> method,
-the invocand is an object reference.
+method, the invocant is a package name. In an L</instance> method,
+the invocant is an object reference.
=item invocation
diff --git a/pod/perlmod.pod b/pod/perlmod.pod
index 5266f19..17de73e 100644
--- a/pod/perlmod.pod
+++ b/pod/perlmod.pod
@@ -571,7 +571,7 @@ like for example handle the cloning of non-Perl data, if necessary.
C<CLONE> will be called once as a class method for every package that has it
defined (or inherits it). It will be called in the context of the new thread,
so all modifications are made in the new area. Currently CLONE is called with
-no parameters other than the invocand package name, but code should not assume
+no parameters other than the invocant package name, but code should not assume
that this will remain unchanged, as it is likely that in future extra parameters
will be passed in to give more information about the state of cloning.
@@ -593,7 +593,7 @@ to make use of the objects, then a more sophisticated approach is
needed.
Like C<CLONE>, C<CLONE_SKIP> is currently called with no parameters other
-than the invocand package name, although that may change. Similarly, to
+than the invocant package name, although that may change. Similarly, to
allow for future expansion, the return value should be a single C<0> or
C<1> value.
diff --git a/pod/perlretut.pod b/pod/perlretut.pod
index ea80594..1c65f5b 100644
--- a/pod/perlretut.pod
+++ b/pod/perlretut.pod
@@ -781,7 +781,7 @@ so may lead to surprising and unsatisfactory results.
=head2 Relative backreferences
Counting the opening parentheses to get the correct number for a
-backreference is errorprone as soon as there is more than one
+backreference is error-prone as soon as there is more than one
capturing group. A more convenient technique became available
with Perl 5.10: relative backreferences. To refer to the immediately
preceding capture group one now may write C<\g{-1}>, the next but
@@ -1537,7 +1537,7 @@ the regexp in the I<last successful match> is used instead. So we have
=head3 Global matching
-The final two modifiers we will disccuss here,
+The final two modifiers we will discuss here,
C<//g> and C<//c>, concern multiple matches.
The modifier C<//g> stands for global matching and allows the
matching operator to match within a string as many times as possible.
@@ -1870,7 +1870,7 @@ substituted.
C<\Q>, C<\L>, C<\l>, C<\U>, C<\u> and C<\E> are actually part of
double-quotish syntax, and not part of regexp syntax proper. They will
-work if they appear in a regular expression embeddded directly in a
+work if they appear in a regular expression embedded directly in a
program, but not when contained in a string that is interpolated in a
pattern.

View File

@ -0,0 +1,153 @@
From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Respect umask during installation
This is needed to satisfy Debian policy regarding group-writable
site directories.
Patch-Name: fixes/respect_umask.diff
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 18 +++++++++---------
dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 6964eea..865d36d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2053,7 +2053,7 @@ doc__install : doc_site_install
$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
pure_perl_install :: all
- $(NOECHO) $(MOD_INSTALL) \
+ $(NOECHO) umask 022; $(MOD_INSTALL) \
read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLPRIVLIB) \
@@ -2067,7 +2067,7 @@ pure_perl_install :: all
pure_site_install :: all
- $(NOECHO) $(MOD_INSTALL) \
+ $(NOECHO) umask 022; $(MOD_INSTALL) \
read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLSITELIB) \
@@ -2080,7 +2080,7 @@ pure_site_install :: all
}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
pure_vendor_install :: all
- $(NOECHO) $(MOD_INSTALL) \
+ $(NOECHO) umask 022; $(MOD_INSTALL) \
read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLVENDORLIB) \
@@ -2092,8 +2092,8 @@ pure_vendor_install :: all
doc_perl_install :: all
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) $(DOC_INSTALL) \
+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLPRIVLIB)" \
LINKTYPE "$(LINKTYPE)" \
@@ -2103,8 +2103,8 @@ doc_perl_install :: all
doc_site_install :: all
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) $(DOC_INSTALL) \
+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
@@ -2114,8 +2114,8 @@ doc_site_install :: all
doc_vendor_install :: all
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) $(DOC_INSTALL) \
+ -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
+ -$(NOECHO) umask 022; $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLVENDORLIB)" \
LINKTYPE "$(LINKTYPE)" \
diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
index 3b030a5..cb0e9e0 100644
--- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
@@ -468,7 +468,7 @@ sub _can_write_dir {
=pod
-=item _mkpath($dir,$show,$mode,$verbose,$dry_run)
+=item _mkpath($dir,$show,$verbose,$dry_run)
Wrapper around File::Path::mkpath() to handle errors.
@@ -485,13 +485,13 @@ writable.
=cut
sub _mkpath {
- my ($dir,$show,$mode,$verbose,$dry_run)=@_;
+ my ($dir,$show,$verbose,$dry_run)=@_;
if ( $verbose && $verbose > 1 && ! -d $dir) {
$show= 1;
- printf "mkpath(%s,%d,%#o)\n", $dir, $show, $mode;
+ printf "mkpath(%s,%d)\n", $dir, $show;
}
if (!$dry_run) {
- if ( ! eval { File::Path::mkpath($dir,$show,$mode); 1 } ) {
+ if ( ! eval { File::Path::mkpath($dir,$show); 1 } ) {
_choke("Can't create '$dir'","$@");
}
@@ -796,7 +796,7 @@ sub install { #XXX OS-SPECIFIC
_chdir($cwd);
}
foreach my $targetdir (sort keys %check_dirs) {
- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
+ _mkpath( $targetdir, 0, $verbose, $dry_run );
}
foreach my $found (@found_files) {
my ($diff, $ffd, $origfile, $mode, $size, $atime, $mtime,
@@ -810,7 +810,7 @@ sub install { #XXX OS-SPECIFIC
$targetfile= _unlink_or_rename( $targetfile, 'tryhard', 'install' )
unless $dry_run;
} elsif ( ! -d $targetdir ) {
- _mkpath( $targetdir, 0, 0755, $verbose, $dry_run );
+ _mkpath( $targetdir, 0, $verbose, $dry_run );
}
print "Installing $targetfile\n";
@@ -850,7 +850,7 @@ sub install { #XXX OS-SPECIFIC
if ($pack{'write'}) {
$dir = install_rooted_dir(dirname($pack{'write'}));
- _mkpath( $dir, 0, 0755, $verbose, $dry_run );
+ _mkpath( $dir, 0, $verbose, $dry_run );
print "Writing $pack{'write'}\n" if $verbose;
$packlist->write(install_rooted_file($pack{'write'})) unless $dry_run;
}
@@ -1190,7 +1190,7 @@ be prepended as a directory to each installed file (and directory).
sub pm_to_blib {
my($fromto,$autodir,$pm_filter) = @_;
- _mkpath($autodir,0,0755);
+ _mkpath($autodir,0);
while(my($from, $to) = each %$fromto) {
if( -f $to && -s $from == -s $to && -M $to < -M $from ) {
print "Skip $to (unchanged)\n";
@@ -1213,7 +1213,7 @@ sub pm_to_blib {
# we wont try hard here. its too likely to mess things up.
forceunlink($to);
} else {
- _mkpath(dirname($to),0,0755);
+ _mkpath(dirname($to),0);
}
if ($need_filtering) {
run_filter($pm_filter, $from, $to);

View File

@ -0,0 +1,36 @@
From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Wed, 3 Aug 2011 22:36:24 +0300
Subject: Use a socket timeout on GNU/kFreeBSD to catch ICMP port unreachable
messages
Bug: http://rt.cpan.org/Ticket/Display.html?id=69997
Bug-Debian: http://bugs.debian.org/627821
Without this, openlog() on a UDP socket may succeed on the FreeBSD kernel
even when there's no listener, causing test failures.
It seems probable that all FreeBSD-based systems suffer from the
same issue, but that's for upstream to decide.
Patch-Name: fixes/sys-syslog-socket-timeout-kfreebsd.patch
---
cpan/Sys-Syslog/Syslog.pm | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
index 002e6e4..b445c66 100644
--- a/cpan/Sys-Syslog/Syslog.pm
+++ b/cpan/Sys-Syslog/Syslog.pm
@@ -138,7 +138,10 @@ my @fallbackMethods = ();
# happy, the timeout is now zero by default on all systems
# except on OSX where it is set to 250 msec, and can be set
# with the infamous setlogsock() function.
-$sock_timeout = 0.25 if $^O =~ /darwin/;
+#
+# Debian change: include Debian GNU/kFreeBSD, lower to 1ms
+# see [rt.cpan.org #69997]
+$sock_timeout = 0.001 if $^O =~ /darwin|gnukfreebsd/;
# coderef for a nicer handling of errors
my $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak;

View File

@ -1,8 +1,9 @@
Upstream-Status:Inappropriate [debian patch]
From ab89a31d1f46388a61953349c3546e4082cd38de Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Debian policy doesn't install .packlist files for core or vendor.
Patch-Name: debian/instmodsh_doc.diff
---
cpan/ExtUtils-MakeMaker/bin/instmodsh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
@ -24,5 +25,3 @@ index 5874aa6..6a2f03e 100644
=head1 SEE ALSO
ExtUtils::Installed
--
tg: (a508b62..) debian/instmodsh_doc (depends on: upstream)

View File

@ -1,25 +1,24 @@
Upstream-Status:Inappropriate [debian patch]
From 704f6017119ce0301a9105944512120a38a43a02 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
Subject: Remove standard libs from LD_RUN_PATH as per Debian policy.
Patch-Name: debian/ld_run_path.diff
---
.../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
index b807e97..6c955d7 100644
index cf4826f..eb212b5 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -53,6 +53,9 @@ sub _unix_os2_ext {
@@ -54,6 +54,9 @@ sub _unix_os2_ext {
my($pwd) = cwd(); # from Cwd.pm
my($found) = 0;
+ # Debian-specific: don't use LD_RUN_PATH for standard dirs
+ $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
+ $ld_run_path_seen{$_}++ for @libpath;
+
foreach my $thislib (split ' ', $potential_libs) {
# Handle possible linker path arguments.
--
tg: (a508b62..) debian/ld_run_path (depends on: upstream)

View File

@ -1,8 +1,10 @@
Upstream-Status:Inappropriate [debian patch]
Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be writable.
From 7465b6d008187580eabe655b9c8e75351d3d24b4 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Set location of libnet.cfg to /etc/perl/Net as /usr may not be
writable.
Patch-Name: debian/libnet_config_path.diff
---
cpan/libnet/Net/Config.pm | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
@ -33,5 +35,3 @@ index db51c1f..8404593 100644
can be done by having a C<.libnetrc> file in their home directory. This file
should return a reference to a HASH containing the keys described below.
For example
--
tg: (a508b62..) debian/libnet_config_path (depends on: upstream)

View File

@ -0,0 +1,26 @@
From d70e88badfcc6edd05e884597f19fbbdcf2cf6a7 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Note that libperl-dev package is required for embedded linking
Bug-Debian: http://bugs.debian.org/186778
Patch-Name: debian/libperl_embed_doc.diff
---
lib/ExtUtils/Embed.pm | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
index 9710630..86f13b5 100644
--- a/lib/ExtUtils/Embed.pm
+++ b/lib/ExtUtils/Embed.pm
@@ -305,6 +305,9 @@ and extensions in your C/C++ applications.
Typically, an application B<Makefile> will invoke ExtUtils::Embed
functions while building your application.
+Note that on Debian systems the B<libperl-dev> package is required for
+compiling applications which embed an interpreter.
+
=head1 @EXPORT
ExtUtils::Embed exports the following functions:

View File

@ -1,16 +1,19 @@
Upstream-Status:Inappropriate [debian patch]
From 55a718425dc4612ac01850ef786f75f072b20b9e Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Mon, 8 Sep 2008 20:48:14 +0300
Subject: Disable some threads tests on m68k for now due to missing TLS.
Closes: #495826, #517938
Bug-Debian: http://bugs.debian.org/495826
Bug-Debian: http://bugs.debian.org/517938
Patch-Name: debian/m68k_thread_stress.diff
---
dist/threads-shared/t/stress.t | 4 ++++
dist/threads-shared/t/waithires.t | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/dist/threads-shared/t/stress.t b/dist/threads-shared/t/stress.t
index adfd1ed..8573f1a 100755
index 652a3e6..2f1b576 100644
--- a/dist/threads-shared/t/stress.t
+++ b/dist/threads-shared/t/stress.t
@@ -11,6 +11,10 @@ BEGIN {
@ -25,7 +28,7 @@ index adfd1ed..8573f1a 100755
use ExtUtils::testlib;
diff --git a/dist/threads-shared/t/waithires.t b/dist/threads-shared/t/waithires.t
index e3a1086..633374e 100755
index 3c3e852..349c5b4 100644
--- a/dist/threads-shared/t/waithires.t
+++ b/dist/threads-shared/t/waithires.t
@@ -16,6 +16,12 @@ BEGIN {
@ -41,5 +44,3 @@ index e3a1086..633374e 100755
}
use ExtUtils::testlib;
--
tg: (a508b62..) debian/m68k_thread_stress (depends on: upstream)

View File

@ -1,5 +1,6 @@
Upstream-Status:Inappropriate [debian patch]
From 11633e598640b02e19329f323623af254fbac451 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
Subject: Tweak @INC ordering for Debian
Our order is:
@ -15,16 +16,16 @@ The rationale being that an admin (via site), or module packager
(vendor) can chose to shadow core modules when there is a newer
version than is included in core.
Patch-Name: debian/mod_paths.diff
---
perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/perl.c b/perl.c
index 05cea40..023d6a0 100644
index f756e02..d26dcb0 100644
--- a/perl.c
+++ b/perl.c
@@ -4125,6 +4125,11 @@ S_init_perllib(pTHX)
@@ -4219,6 +4219,11 @@ S_init_perllib(pTHX)
INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
#endif
@ -36,7 +37,7 @@ index 05cea40..023d6a0 100644
#ifdef SITEARCH_EXP
/* sitearch is always relative to sitelib on Windows for
* DLL-based path intuition to work correctly */
@@ -4242,6 +4247,59 @@ S_init_perllib(pTHX)
@@ -4336,6 +4341,59 @@ S_init_perllib(pTHX)
INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
#endif
@ -96,5 +97,3 @@ index 05cea40..023d6a0 100644
#ifdef PERL_OTHERLIBDIRS
S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS
--
tg: (a508b62..) debian/mod_paths (depends on: upstream)

View File

@ -1,17 +1,21 @@
Upstream-Status:Inappropriate [debian patch]
From fbb5f07872d45bac76b5c3c83b50a19aa5da10b0 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Thu, 8 May 2008 14:32:33 +0300
Subject: Adjust Module::Build manual page extensions for the Debian Perl
policy
Subject: Adjust Module::Build manual page extensions for the Debian Perl policy
Bug-Debian: http://bugs.debian.org/479460
Patch-Name: debian/module_build_man_extensions.diff
---
cpan/Module-Build/lib/Module/Build/Base.pm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/Module-Build/lib/Module/Build/Base.pm b/cpan/Module-Build/lib/Module/Build/Base.pm
index 5bd8ec7..b4e606a 100644
index fba916a..82df4cc 100644
--- a/cpan/Module-Build/lib/Module/Build/Base.pm
+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
@@ -3071,7 +3071,7 @@ sub manify_bin_pods {
@@ -3246,7 +3246,7 @@ sub manify_bin_pods {
foreach my $file (keys %$files) {
# Pod::Simple based parsers only support one document per instance.
# This is expected to change in a future version (Pod::Simple > 3.03).
@ -20,7 +24,7 @@ index 5bd8ec7..b4e606a 100644
my $manpage = $self->man1page_name( $file ) . '.' .
$self->config( 'man1ext' );
my $outfile = File::Spec->catfile($mandir, $manpage);
@@ -3096,7 +3096,7 @@ sub manify_lib_pods {
@@ -3271,7 +3271,7 @@ sub manify_lib_pods {
while (my ($file, $relfile) = each %$files) {
# Pod::Simple based parsers only support one document per instance.
# This is expected to change in a future version (Pod::Simple > 3.03).
@ -29,5 +33,3 @@ index 5bd8ec7..b4e606a 100644
my $manpage = $self->man3page_name( $relfile ) . '.' .
$self->config( 'man3ext' );
my $outfile = File::Spec->catfile( $mandir, $manpage);
--
tg: (a508b62..) debian/module_build_man_extensions (depends on: upstream)

View File

@ -0,0 +1,88 @@
From 44c7521619dd0e637920393184affcb26a27d5b7 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Don't install .packlist or perllocal.pod for perl or vendor
Patch-Name: debian/no_packlist_perllocal.diff
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 31 +++--------------------
1 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 42bbb83..a16e2d0 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2054,8 +2054,6 @@ doc__install : doc_site_install
pure_perl_install :: all
$(NOECHO) umask 022; $(MOD_INSTALL) \
- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLPRIVLIB) \
$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
$(INST_BIN) $(DESTINSTALLBIN) \
@@ -2081,8 +2079,6 @@ pure_site_install :: all
pure_vendor_install :: all
$(NOECHO) umask 022; $(MOD_INSTALL) \
- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLVENDORLIB) \
$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
$(INST_BIN) $(DESTINSTALLVENDORBIN) \
@@ -2091,37 +2087,19 @@ pure_vendor_install :: all
$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
doc_perl_install :: all
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) umask 022; $(DOC_INSTALL) \
- "Module" "$(NAME)" \
- "installed into" "$(INSTALLPRIVLIB)" \
- LINKTYPE "$(LINKTYPE)" \
- VERSION "$(VERSION)" \
- EXE_FILES "$(EXE_FILES)" \
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
doc_site_install :: all
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB)
+ $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLSITEARCH)
-$(NOECHO) umask 02; $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{
doc_vendor_install :: all
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) umask 022; $(DOC_INSTALL) \
- "Module" "$(NAME)" \
- "installed into" "$(INSTALLVENDORLIB)" \
- LINKTYPE "$(LINKTYPE)" \
- VERSION "$(VERSION)" \
- EXE_FILES "$(EXE_FILES)" \
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
};
@@ -2130,13 +2108,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
$(NOECHO) $(NOOP)
uninstall_from_perldirs ::
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
uninstall_from_sitedirs ::
$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
uninstall_from_vendordirs ::
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
+
};
join("",@m);

View File

@ -0,0 +1,30 @@
From cf928101697efa4a46ada500c2f449caeb854fd4 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sun, 15 May 2011 19:35:58 +0300
Subject: List packaged patches in patchlevel.h
Origin: vendor
Bug-Debian: http://bugs.debian.org/567489
The list of packaged patches is in patchlevel-debian.h, which is generated
from the debian/patches/ directory when building the package.
Patch-Name: debian/patchlevel.diff
---
patchlevel.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/patchlevel.h b/patchlevel.h
index 5dc2a53..1356595 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
,"uncommitted-changes"
#endif
PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
+#ifdef DEBIAN
+#include "patchlevel-debian.h"
+#endif
,NULL
};

View File

@ -1,8 +1,9 @@
Upstream-Status:Inappropriate [debian patch]
From 4c7e04f75c9513451d1622e5a6dd58c2c8377d81 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Fri, 9 Jan 2009 18:54:47 +0200
Subject: Make perlivp skip include directories in /usr/local
Closes: 510895
Bug-Debian: http://bugs.debian.org/510895
On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote:
> On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote:
@ -17,15 +18,15 @@ On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote:
> installed any local packages. As Niko points out, they will be
> created as required.
Signed-off-by: Niko Tyni <ntyni@debian.org>
Patch-Name: debian/perlivp.diff
---
utils/perlivp.PL | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/utils/perlivp.PL b/utils/perlivp.PL
index 9783261..156146f 100644
index 6fcb670..1401cac 100644
--- a/utils/perlivp.PL
+++ b/utils/perlivp.PL
@@ -142,6 +142,7 @@ my $INC_total = 0;
@ -33,8 +34,6 @@ index 9783261..156146f 100644
foreach (@INC) {
next if $_ eq '.'; # skip -d test here
+ next if m|/usr/local|; # not shipped on Debian
if ($^O eq 'MacOS') {
next if $_ eq ':'; # skip -d test here
next if $_ eq 'Dev:Pseudo:'; # why is this in @INC?
--
tg: (a508b62..) debian/perlivp (depends on: upstream)
if (-d $_) {
print "## Perl \@INC directory `$_' exists.\n" if $opt{'v'};
$INC_there++;

View File

@ -0,0 +1,118 @@
From 148e2717682ce8c65475ffdeea84b3cdd1ab1649 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Fiddle with *PREFIX and variables written to the makefile
Fiddle with *PREFIX and variables written to the makefile so that
install directories may be changed when make is run by passing
PREFIX= to the "make install" command (used when packaging
modules).
Patch-Name: debian/prefix_changes.diff
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 12 ++++++------
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 3 +--
cpan/ExtUtils-MakeMaker/t/INST.t | 4 +---
cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t | 10 +++++-----
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index a38f274..93d3fe9 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -701,8 +701,6 @@ all POD files in MAN1PODS and MAN3PODS.
sub manifypods_target {
my($self) = shift;
- my $man1pods = '';
- my $man3pods = '';
my $dependencies = '';
# populate manXpods & dependencies:
@@ -718,7 +716,7 @@ END
foreach my $section (qw(1 3)) {
my $pods = $self->{"MAN${section}PODS"};
push @man_cmds, $self->split_command(<<CMD, %$pods);
- \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
+ \$(NOECHO) \$(POD2MAN) --section=\$(MAN${section}EXT) --perm_rw=\$(PERM_RW)
CMD
}
@@ -1521,9 +1519,11 @@ sub init_INSTALL_from_PREFIX {
$self->{SITEPREFIX} ||= $sprefix;
$self->{VENDORPREFIX} ||= $vprefix;
- # Lots of MM extension authors like to use $(PREFIX) so we
- # put something sensible in there no matter what.
- $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
+ my $p = $self->{PREFIX} = $self->{PERLPREFIX};
+ for my $t (qw/PERL SITE VENDOR/)
+ {
+ $self->{"${t}PREFIX"} =~ s!^\Q$p\E(?=/|$)!\$(PREFIX)!;
+ }
}
my $arch = $Config{archname};
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index a16e2d0..c308c49 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2981,8 +2981,7 @@ sub prefixify {
print STDERR " prefixify $var => $path\n" if $Verbose >= 2;
print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2;
- if( $self->{ARGS}{PREFIX} &&
- $path !~ s{^\Q$sprefix\E\b}{$rprefix}s )
+ if( $path !~ s{^\Q$sprefix\E\b}{$rprefix}s && $self->{ARGS}{PREFIX} )
{
print STDERR " cannot prefix, using default.\n" if $Verbose >= 2;
diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t
index 6aac294..28294f2 100644
--- a/cpan/ExtUtils-MakeMaker/t/INST.t
+++ b/cpan/ExtUtils-MakeMaker/t/INST.t
@@ -61,9 +61,7 @@ isa_ok( $mm, 'ExtUtils::MakeMaker' );
is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
is( $mm->{VERSION}, 0.01, 'VERSION' );
-my $config_prefix = $Config{installprefixexp} || $Config{installprefix} ||
- $Config{prefixexp} || $Config{prefix};
-is( $mm->{PERLPREFIX}, $config_prefix, 'PERLPREFIX' );
+is( $mm->{PERLPREFIX}, '$(PREFIX)', 'PERLPREFIX' );
is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
index fbb18a3..8987569 100644
--- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
+++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
@@ -10,7 +10,7 @@ BEGIN {
}
use strict;
-use Test::More tests => 52;
+use Test::More tests => 47;
use MakeMaker::Test::Utils;
use MakeMaker::Test::Setup::BFD;
use ExtUtils::MakeMaker;
@@ -58,16 +58,16 @@ like( $stdout->read, qr{
Writing\ MYMETA.yml\n
}x );
-is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
+#is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
isa_ok( $mm, 'ExtUtils::MakeMaker' );
is( $mm->{NAME}, 'Big::Dummy', 'NAME' );
is( $mm->{VERSION}, 0.01, 'VERSION' );
-foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
- unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
-}
+#foreach my $prefix (qw(PREFIX PERLPREFIX SITEPREFIX VENDORPREFIX)) {
+# unlike( $mm->{$prefix}, qr/\$\(PREFIX\)/ );
+#}
my $PREFIX = File::Spec->catdir('foo', 'bar');

View File

@ -1,21 +1,23 @@
Upstream-Status:Inappropriate [debian patch]
From 063566907896ff32bea27897fa73cebbbd7bacce Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
Subject: Prune the list of libraries wanted to what we actually need.
Bug-Debian: http://bugs.debian.org/128355
We want to keep the dependencies on perl-base as small as possible,
and some of the original list may be present on buildds (see Bug#128355).
Patch-Name: debian/prune_libs.diff
---
Configure | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Configure b/Configure
index 3a8732b..6013c86 100755
index d9911f9..f59f75c 100755
--- a/Configure
+++ b/Configure
@@ -1363,8 +1363,7 @@ libswanted_uselargefiles=''
@@ -1367,8 +1367,7 @@ libswanted_uselargefiles=''
: set usesocks on the Configure command line to enable socks.
: List of libraries we want.
: If anyone needs extra -lxxx, put those in a hint file.
@ -25,7 +27,7 @@ index 3a8732b..6013c86 100755
: We probably want to search /usr/shlib before most other libraries.
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
@@ -22179,7 +22178,7 @@ sunos*X4*)
@@ -22308,7 +22307,7 @@ sunos*X4*)
;;
*) case "$usedl" in
$define|true|[yY]*)
@ -34,5 +36,3 @@ index 3a8732b..6013c86 100755
shift
perllibs="$*"
;;
--
tg: (a508b62..) debian/prune_libs (depends on: upstream)

View File

@ -0,0 +1,40 @@
debian/arm_thread_stress_timeout.diff
debian/cpan_definstalldirs.diff
debian/db_file_ver.diff
debian/doc_info.diff
debian/enc2xs_inc.diff
debian/errno_ver.diff
debian/libperl_embed_doc.diff
fixes/respect_umask.diff
debian/writable_site_dirs.diff
debian/extutils_set_libperl_path.diff
debian/no_packlist_perllocal.diff
debian/prefix_changes.diff
debian/fakeroot.diff
debian/instmodsh_doc.diff
debian/ld_run_path.diff
debian/libnet_config_path.diff
debian/m68k_thread_stress.diff
debian/mod_paths.diff
debian/module_build_man_extensions.diff
debian/prune_libs.diff
fixes/net_smtp_docs.diff
debian/perlivp.diff
debian/disable-zlib-bundling.diff
debian/cpanplus_definstalldirs.diff
debian/cpanplus_config_path.diff
debian/deprecate-with-apt.diff
fixes/hurd-ccflags.diff
debian/squelch-locale-warnings.diff
debian/skip-upstream-git-tests.diff
fixes/extutils-cbuilder-cflags.diff
fixes/module-build-home-directory.diff
debian/patchlevel.diff
fixes/h2ph-multiarch.diff
fixes/index-tainting.diff
debian/skip-kfreebsd-crash.diff
fixes/document_makemaker_ccflags.diff
fixes/sys-syslog-socket-timeout-kfreebsd.patch
fixes/hurd-hints.diff
fixes/pod_fixes.diff
debian/find_html2text.diff

View File

@ -0,0 +1,39 @@
From ff2815399ad94915da2e63cb3c4bbd2d02dac4b2 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Fri, 5 Aug 2011 10:50:18 +0300
Subject: Skip a crashing test case in t/op/threads.t on GNU/kFreeBSD
Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=96272
Bug-Debian: http://bugs.debian.org/628493
The crash is not a regression in 5.14, it just gets triggered there by
a new unrelated test case.
Skip the test until the culprit is found.
Patch-Name: debian/skip-kfreebsd-crash.diff
---
t/op/threads.t | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/t/op/threads.t b/t/op/threads.t
index 24e84e4..6a91366 100644
--- a/t/op/threads.t
+++ b/t/op/threads.t
@@ -342,6 +342,9 @@ threads->create(
EOI
+SKIP: {
+ skip "[perl #96272] avoid crash on GNU/kFreeBSD", 1
+ if $^O eq 'gnukfreebsd';
# [perl #78494] Pipes shared between threads block when closed
watchdog 10;
{
@@ -351,5 +354,6 @@ watchdog 10;
threads->create(sub { })->join;
ok(1, "Pipes shared between threads do not block when closed");
}
+}
# EOF

View File

@ -0,0 +1,59 @@
From 2be2eed9148c38d3e982d3371f379ce77021aeb5 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Fri, 22 Apr 2011 11:15:32 +0300
Subject: Skip tests specific to the upstream Git repository
These tests fail if run from a different git repository than
upstream. This complicates things needlessly for downstream packagers.
Skip the tests altogether even if the .git directory exists.
Patch-Name: debian/skip-upstream-git-tests.diff
---
t/porting/authors.t | 3 ++-
t/porting/cmp_version.t | 3 ++-
t/porting/manifest.t | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/t/porting/authors.t b/t/porting/authors.t
index 28ca1ca..3c7f069 100644
--- a/t/porting/authors.t
+++ b/t/porting/authors.t
@@ -9,7 +9,8 @@ BEGIN {
use strict;
use warnings;
-if (! -d '.git' ) {
+# Debian change: skip as we're probably in a different git repository
+if (1 || ! -d '.git' ) {
print "1..0 # SKIP: not being run from a git checkout\n";
exit 0;
}
diff --git a/t/porting/cmp_version.t b/t/porting/cmp_version.t
index b3c677c..f89f2a7 100644
--- a/t/porting/cmp_version.t
+++ b/t/porting/cmp_version.t
@@ -25,7 +25,8 @@ use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir);
use Getopt::Std;
use Maintainers;
-if (! -d '.git' ) {
+# Debian change: skip as we're probably in a different git repository
+if (1 || ! -d '.git' ) {
print "1..0 # SKIP: not being run from a git checkout\n";
exit 0;
}
diff --git a/t/porting/manifest.t b/t/porting/manifest.t
index 48dd3ac..b08126b 100644
--- a/t/porting/manifest.t
+++ b/t/porting/manifest.t
@@ -59,7 +59,8 @@ SKIP: {
SKIP: {
chdir "..";
- skip("not under git control", 3) unless -d '.git';
+ # Debian change: skip as we're probably in a different git repository
+ skip("not under git control", 3) unless 0 && -d '.git';
chomp(my @repo= grep { !/\.gitignore$/ } `git ls-files`);
skip("git ls-files didnt work",3)
if !@repo;

View File

@ -1,7 +1,8 @@
Upstream-Status:Inappropriate [debian patch]
From 718e9cbd59f0739fc9104af111e42fff66f927a7 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sun, 3 Oct 2010 21:36:17 +0300
Subject: Squelch locale warnings in Debian package maintainer scripts
Bug-Debian: http://bugs.debian.org/508764
The system locales are rather frequently out of sync with the C library
@ -12,13 +13,14 @@ by the DPKG_RUNNING_VERSION environment variable.
Any real locale problem will show up after the system upgrade too, and
the warning will be triggered normally again at that point.
Patch-Name: debian/squelch-locale-warnings.diff
---
locale.c | 4 ++++
pod/perllocale.pod | 8 ++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/locale.c b/locale.c
index 16ccce8..2592b3c 100644
index 4631b86..94a0962 100644
--- a/locale.c
+++ b/locale.c
@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
@ -33,10 +35,10 @@ index 16ccce8..2592b3c 100644
if (locwarn) {
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
index 0dbabe7..60b7bab 100644
index 8926d8b..6c55889 100644
--- a/pod/perllocale.pod
+++ b/pod/perllocale.pod
@@ -844,6 +844,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
@@ -861,6 +861,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
The message tells about some problem in your system's locale support,
and you should investigate what the problem is.
@ -51,5 +53,3 @@ index 0dbabe7..60b7bab 100644
=back
The following environment variables are not specific to Perl: They are
--
tg: (a508b62..) debian/squelch-locale-warnings (depends on: upstream)

View File

@ -0,0 +1,36 @@
From 492e0d6b4e3e0d786fb88b9058d581f6466c4a3e Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: Set umask approproately for site install directories
Policy requires group writable site directories
Patch-Name: debian/writable_site_dirs.diff
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 865d36d..4ee6b3f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2067,7 +2067,7 @@ pure_perl_install :: all
pure_site_install :: all
- $(NOECHO) umask 022; $(MOD_INSTALL) \
+ $(NOECHO) umask 02; $(MOD_INSTALL) \
read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
$(INST_LIB) $(DESTINSTALLSITELIB) \
@@ -2103,8 +2103,8 @@ doc_perl_install :: all
doc_site_install :: all
$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
- -$(NOECHO) umask 022; $(MKPATH) $(DESTINSTALLARCHLIB)
- -$(NOECHO) umask 022; $(DOC_INSTALL) \
+ -$(NOECHO) umask 02; $(MKPATH) $(DESTINSTALLARCHLIB)
+ -$(NOECHO) umask 02; $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \

View File

@ -10,16 +10,15 @@ This fixes this warning for perl recipe as well as libxml-parser-perl recipe.
It is a fix to MakeMaker within perl, so all such perl recipes will get
fixed with this perl fix.
Index: perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
Index: perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
===================================================================
--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -54,7 +54,7 @@ sub _unix_os2_ext {
--- perl-5.14.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ perl-5.14.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -55,6 +55,7 @@ sub _unix_os2_ext {
my($found) = 0;
# Debian-specific: don't use LD_RUN_PATH for standard dirs
- $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
+ $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib SYSROOTLIB);
+ push(@libpath, "SYSROOTLIB");
$ld_run_path_seen{$_}++ for @libpath;
foreach my $thislib (split ' ', $potential_libs) {

View File

@ -9,18 +9,20 @@ to use the settings appropriate for the native and/or target builds
as required. This also disables the use of the cache since the cached
values would be valid for the host only.
--- perl-5.8.8/configpm 2007/04/30 03:10:43 1.1
+++ perl-5.8.8/configpm 2007/04/30 03:11:56
@@ -374,7 +374,7 @@
Index: perl-5.14.2/configpm
===================================================================
--- perl-5.14.2.orig/configpm
+++ perl-5.14.2/configpm
@@ -658,7 +658,7 @@ sub FETCH {
my($self, $key) = @_;
# check for cached value (which may be undef so we use exists not defined)
- return $self->{$key} if exists $self->{$key};
+ #return $self->{$key} if exists $self->{$key};
return $self->fetch_string($key);
- return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key);
+ return $self->fetch_string($key);
}
@@ -530,7 +530,21 @@
ENDOFEND
@@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa
sub DESTROY { }
sub AUTOLOAD {

View File

@ -7,12 +7,14 @@ system.
Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
--- perl-5.12.3/dist/XSLoader/XSLoader_pm.PL 2007/04/20 09:03:08 1.1
+++ perl-5.12.3/dist/XSLoader/XSLoader_pm.PL 2007/04/20 09:03:08
@@ -65,6 +65,19 @@
print OUT <<'EOT';
my $modpname = join('/',@modparts);
my $modlibname = (caller())[1];
Index: perl-5.14.2/dist/XSLoader/XSLoader_pm.PL
===================================================================
--- perl-5.14.2.orig/dist/XSLoader/XSLoader_pm.PL
+++ perl-5.14.2/dist/XSLoader/XSLoader_pm.PL
@@ -28,6 +28,20 @@ sub load {
my ($module, $modlibname) = caller();
+ # OE: Allow env to form dynamic loader to look in a different place
+ # This is so it finds the host .so files, not the targets
+ if (defined $ENV{PERLHOSTLIB})
@ -26,6 +28,7 @@ Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
+ }
+ print STDERR "*** Module name OUT: $modlibname\n";
+ }
my $c = @modparts;
$modlibname =~ s,[\\/][^\\/]+$,, while $c--; # Q&D basename
my $file = "$modlibname/auto/$modpname/$modfname.$dl_dlext";
+
if (@_) {
$module = $_[0];
} else {

View File

@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "Artistic|GPL"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
PR = "r5"
PR = "r0"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@ -12,18 +12,12 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://Configure-multilib.patch \
file://perl-configpm-switch.patch \
file://parallel_build_fix_1.patch \
file://parallel_build_fix_2.patch \
file://parallel_build_fix_3.patch \
file://parallel_build_fix_4.patch \
file://parallel_build_fix_5.patch \
file://parallel_build_fix_6.patch \
file://native-nopacklist.patch \
file://native-perlinc.patch \
file://MM_Unix.pm.patch"
SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
SRC_URI[md5sum] = "3306fbaf976dcebdcd49b2ac0be00eb9"
SRC_URI[sha256sum] = "6488359573bd7d41761bf935f66f827dc220fb3df961ef9b775d51fbd66548d3"
S = "${WORKDIR}/perl-${PV}"
@ -88,15 +82,17 @@ do_install () {
install lib/ExtUtils/typemap ${D}${libdir}/perl/${PV}/ExtUtils/
# perl shared library headers
for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \
uconfig.h XSUB.h cc_runtime.h embedvar.h handy.h opnames.h \
perliol.h pp_proto.h regnodes.h unixish.h config.h EXTERN.h \
hv.h malloc_ctl.h pad.h perlsdio.h proto.h scope.h utf8.h \
cop.h fakesdio.h INTERN.h mg.h patchlevel.h perlsfio.h \
reentr.h sv.h utfebcdic.h cv.h fakethr.h intrpvar.h \
nostdio.h perlapi.h perlvars.h util.h \
dosish.h form.h iperlsys.h opcode.h perl.h perly.h regcomp.h \
thread.h warnings.h; do
for i in av.h bitcount.h config.h cop.h cv.h dosish.h embed.h embedvar.h \
EXTERN.h fakesdio.h fakethr.h form.h gv.h handy.h hv.h INTERN.h \
intrpvar.h iperlsys.h keywords.h l1_char_class_tab.h malloc_ctl.h \
metaconfig.h mg.h mydtrace.h nostdio.h opcode.h op.h opnames.h \
op_reg_common.h overload.h pad.h parser.h patchlevel.h perlapi.h \
perl.h perlio.h perliol.h perlsdio.h perlsfio.h perlvars.h \
perly.h pp.h pp_proto.h proto.h reentr.h regcharclass.h regcomp.h \
regexp.h regnodes.h scope.h sv.h thread.h time64_config.h \
time64.h uconfig.h unixish.h utf8.h utfebcdic.h util.h \
uudmap.h warnings.h XSUB.h
do
install $i ${D}${libdir}/perl/${PV}/CORE
done

View File

@ -17,14 +17,15 @@ RDEPENDS_perl-module-math-bigint-calc += "perl-module-integer "
# Depends list
# copy contents of /tmp/1 in this file
RDEPENDS_perl-module-archive-tar += "perl-module-exporter"
RDEPENDS_perl-module-archive-tar-file += "perl-module-archive-tar"
RDEPENDS_perl-module-archive-tar += "perl-module-exporter"
RDEPENDS_perl-module-attributes += "perl-module-xsloader"
RDEPENDS_perl-module-b += "perl-module-exporter"
RDEPENDS_perl-module-b-debug += "perl-module-b"
RDEPENDS_perl-module-bignum += "perl-module-bigint"
RDEPENDS_perl-module-bigrat += "perl-module-bigint"
RDEPENDS_perl-module-bigrat += "perl-module-exporter"
RDEPENDS_perl-module-b += "perl-module-exporter"
#RDEPENDS_perl-module-build += "perl-module-module-metadata"
RDEPENDS_perl-module-carp += "perl-module-exporter"
RDEPENDS_perl-module-cgi-util += "perl-module-exporter"
RDEPENDS_perl-module-class-struct += "perl-module-exporter"
@ -32,27 +33,30 @@ RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-exporter"
RDEPENDS_perl-module-compress-raw-zlib += "perl-module-exporter"
RDEPENDS_perl-module-compress-zlib += "perl-module-exporter"
RDEPENDS_perl-module-config-extensions += "perl-module-exporter"
#RDEPENDS_perl-module-cpan += "perl-module-mac-buildtools"
RDEPENDS_perl-module-cpanplus += "perl-module-base"
RDEPENDS_perl-module-cpanplus += "perl-module-cpanplus"
RDEPENDS_perl-module-cpanplus += "perl-module-exporter"
RDEPENDS_perl-module-cpanplus += "perl-module-tie-hash"
RDEPENDS_perl-module-data-dumper += "perl-module-exporter"
RDEPENDS_perl-module-data-dumper += "perl-module-overload"
RDEPENDS_perl-module-devel-peek += "perl-module-exporter"
RDEPENDS_perl-module-devel-peek += "perl-module-xsloader"
RDEPENDS_perl-module-devel-selfstubber += "perl-module-selfloader"
RDEPENDS_perl-module-digest-md5 += "perl-module-exporter"
RDEPENDS_perl-module-digest-sha += "perl-module-dynaloader"
RDEPENDS_perl-module-digest-sha += "perl-module-exporter"
RDEPENDS_perl-module-dynaloader += "perl-module-autoloader"
RDEPENDS_perl-module-encode += "perl-module-encode-config"
RDEPENDS_perl-module-encode += "perl-module-exporter"
RDEPENDS_perl-module-encode-cjkconstants += "perl-module-exporter"
RDEPENDS_perl-module-encode-encoder += "perl-module-exporter"
RDEPENDS_perl-module-encode-encoding += "perl-module-encode"
RDEPENDS_perl-module-encode += "perl-module-encode-config"
RDEPENDS_perl-module-encode += "perl-module-exporter"
RDEPENDS_perl-module-encode-unicode += "perl-module-encode"
RDEPENDS_perl-module-english += "perl-module-exporter"
RDEPENDS_perl-module-errno += "perl-module-exporter"
RDEPENDS_perl-module-exporter-heavy += "perl-module-exporter"
RDEPENDS_perl-module-extutils-command += "perl-module-exporter"
RDEPENDS_perl-module-extutils-command-mm += "perl-module-exporter"
RDEPENDS_perl-module-extutils-command += "perl-module-exporter"
RDEPENDS_perl-module-extutils-constant-proxysubs += "perl-module-extutils-constant-xs"
RDEPENDS_perl-module-extutils-constant-xs += "perl-module-extutils-constant-base"
RDEPENDS_perl-module-extutils-embed += "perl-module-exporter"
@ -64,8 +68,6 @@ RDEPENDS_perl-module-extutils-makemaker += "perl-module-extutils-my"
RDEPENDS_perl-module-extutils-manifest += "perl-module-exporter"
RDEPENDS_perl-module-extutils-miniperl += "perl-module-exporter"
RDEPENDS_perl-module-extutils-mkbootstrap += "perl-module-exporter"
RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-liblist"
RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-makemaker"
RDEPENDS_perl-module-extutils-mm-aix += "perl-module-extutils-mm-unix"
RDEPENDS_perl-module-extutils-mm-beos += "perl-module-extutils-mm-any"
RDEPENDS_perl-module-extutils-mm-beos += "perl-module-extutils-mm-unix"
@ -76,6 +78,8 @@ RDEPENDS_perl-module-extutils-mm-dos += "perl-module-extutils-mm-unix"
RDEPENDS_perl-module-extutils-mm-nw5 += "perl-module-extutils-mm-win32"
RDEPENDS_perl-module-extutils-mm-os2 += "perl-module-extutils-mm-any"
RDEPENDS_perl-module-extutils-mm-os2 += "perl-module-extutils-mm-unix"
RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-liblist"
RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-makemaker"
RDEPENDS_perl-module-extutils-mm-qnx += "perl-module-extutils-mm-unix"
RDEPENDS_perl-module-extutils-mm-unix += "perl-module-extutils-mm-any"
RDEPENDS_perl-module-extutils-mm-uwin += "perl-module-extutils-mm-unix"
@ -89,6 +93,7 @@ RDEPENDS_perl-module-extutils-mm-win95 += "perl-module-extutils-mm-win32"
RDEPENDS_perl-module-extutils-my += "perl-module-extutils-mm"
RDEPENDS_perl-module-extutils-parsexs += "perl-module-exporter"
RDEPENDS_perl-module-fcntl += "perl-module-exporter"
RDEPENDS_perl-module-fcntl += "perl-module-xsloader"
RDEPENDS_perl-module-file-basename += "perl-module-exporter"
RDEPENDS_perl-module-file-compare += "perl-module-exporter"
RDEPENDS_perl-module-file-copy += "perl-module-exporter"
@ -96,6 +101,8 @@ RDEPENDS_perl-module-file-find += "perl-module-cwd"
RDEPENDS_perl-module-file-find += "perl-module-exporter"
RDEPENDS_perl-module-file-find += "perl-module-file-basename"
RDEPENDS_perl-module-file-find += "perl-module-file-spec"
RDEPENDS_perl-module-file-glob += "perl-module-xsloader"
RDEPENDS_perl-module-filehandle += "perl-module-io-file"
RDEPENDS_perl-module-file-spec-cygwin += "perl-module-file-spec-unix"
RDEPENDS_perl-module-file-spec-epoc += "perl-module-file-spec-unix"
RDEPENDS_perl-module-file-spec-functions += "perl-module-exporter"
@ -104,27 +111,29 @@ RDEPENDS_perl-module-file-spec-os2 += "perl-module-file-spec-unix"
RDEPENDS_perl-module-file-spec-vms += "perl-module-file-spec-unix"
RDEPENDS_perl-module-file-spec-win32 += "perl-module-file-spec-unix"
RDEPENDS_perl-module-file-temp += "perl-module-symbol"
RDEPENDS_perl-module-filehandle += "perl-module-io-file"
RDEPENDS_perl-module-filter-util-call += "perl-module-dynaloader"
RDEPENDS_perl-module-filter-util-call += "perl-module-exporter"
RDEPENDS_perl-module-findbin += "perl-module-exporter"
RDEPENDS_perl-module-gdbm-file += "perl-module-carp"
RDEPENDS_perl-module-gdbm-file += "perl-module-exporter"
RDEPENDS_perl-module-gdbm-file += "perl-module-tie-hash"
RDEPENDS_perl-module-gdbm-file += "perl-module-xsloader"
RDEPENDS_perl-module-getopt-std += "perl-module-exporter"
RDEPENDS_perl-module-hash-util += "perl-module-dynaloader"
RDEPENDS_perl-module-hash-util += "perl-module-exporter"
RDEPENDS_perl-module-hash-util-fieldhash += "perl-module-exporter"
RDEPENDS_perl-module-i18n-collate += "perl-module-exporter"
RDEPENDS_perl-module-i18n-langinfo += "perl-module-dynaloader"
RDEPENDS_perl-module-hash-util += "perl-module-exporter"
RDEPENDS_perl-module-hash-util += "perl-module-xsloader"
RDEPENDS_perl-module-i18n-langinfo += "perl-module-exporter"
RDEPENDS_perl-module-i18n-langinfo += "perl-module-xsloader"
RDEPENDS_perl-module-i18n-langtags += "perl-module-exporter"
RDEPENDS_perl-module-inc-latest += "perl-module-inc-latest-private"
RDEPENDS_perl-module-io-compress-base-common += "perl-module-exporter"
RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-deflate += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-gzip += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-gzip-constants += "perl-module-exporter"
RDEPENDS_perl-module-io-compress-gzip += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-zip += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-zip-constants += "perl-module-exporter"
RDEPENDS_perl-module-io-compress-zip += "perl-module-exporter "
RDEPENDS_perl-module-io-compress-zlib-constants += "perl-module-exporter"
RDEPENDS_perl-module-io-file += "perl-module-exporter"
RDEPENDS_perl-module-io-handle += "perl-module-exporter"
@ -152,6 +161,7 @@ RDEPENDS_perl-module-locale-currency += "perl-module-exporter"
RDEPENDS_perl-module-locale-language += "perl-module-exporter"
RDEPENDS_perl-module-locale-script += "perl-module-exporter"
RDEPENDS_perl-module-math-bigfloat += "perl-module-exporter"
RDEPENDS_perl-module-math-bigint-fastcalc += "perl-module-xsloader"
RDEPENDS_perl-module-math-complex += "perl-module-exporter"
RDEPENDS_perl-module-math-trig += "perl-module-exporter"
RDEPENDS_perl-module-mime-base64 += "perl-module-exporter"
@ -168,30 +178,33 @@ RDEPENDS_perl-module-net-ftp-l += "perl-module-net-ftp-i"
RDEPENDS_perl-module-net-ping += "perl-module-exporter"
RDEPENDS_perl-module-net-time += "perl-module-exporter"
RDEPENDS_perl-module-object-accessor += "perl-module-overload"
RDEPENDS_perl-module-perlio-encoding += "perl-module-xsloader"
RDEPENDS_perl-module-perlio-scalar += "perl-module-xsloader"
RDEPENDS_perl-module-perlio-via += "perl-module-xsloader"
RDEPENDS_perl-module-pod-escapes += "perl-module-exporter"
RDEPENDS_perl-module-pod-functions += "perl-module-exporter"
RDEPENDS_perl-module-pod-html += "perl-module-exporter"
RDEPENDS_perl-module-pod-latex += "perl-module-pod-parseutils"
RDEPENDS_perl-module-pod-simple-transcodesmart += "perl-module-encode"
RDEPENDS_perl-module-pod-usage += "perl-module-pod-select"
RDEPENDS_perl-module-posix += "perl-module-exporter"
RDEPENDS_perl-module-posix += "perl-module-xsloader"
RDEPENDS_perl-module-safe += "perl-module-utf8"
RDEPENDS_perl-module-scalar-util += "perl-module-exporter"
RDEPENDS_perl-module-scalar-util += "perl-module-list-util"
RDEPENDS_perl-module-scalar-util-pp += "perl-module-exporter"
RDEPENDS_perl-module-sdbm-file += "perl-module-tie-hash"
RDEPENDS_perl-module-sdbm-file += "perl-module-xsloader"
RDEPENDS_perl-module-search-dict += "perl-module-exporter"
RDEPENDS_perl-module-socket += "perl-module-exporter"
RDEPENDS_perl-module-storable += "perl-module-carp"
RDEPENDS_perl-module-storable += "perl-module-dynaloader"
RDEPENDS_perl-module-socket += "perl-module-xsloader"
RDEPENDS_perl-module-storable += "perl-module-exporter"
RDEPENDS_perl-module-storable += "perl-module-xsloader"
RDEPENDS_perl-module-symbol += "perl-module-exporter"
RDEPENDS_perl-module-sys-hostname += "perl-module-autoloader"
RDEPENDS_perl-module-sys-hostname += "perl-module-exporter"
RDEPENDS_perl-module-term-complete += "perl-module-exporter"
RDEPENDS_perl-module-test += "perl-module-exporter"
RDEPENDS_perl-module-test-builder-module += "perl-module-exporter"
RDEPENDS_perl-module-test-builder-tester-color += "perl-module-test-builder-tester"
RDEPENDS_perl-module-test += "perl-module-exporter"
RDEPENDS_perl-module-text-abbrev += "perl-module-exporter"
RDEPENDS_perl-module-text-tabs += "perl-module-exporter"
RDEPENDS_perl-module-text-wrap += "perl-module-exporter"
@ -203,6 +216,7 @@ RDEPENDS_perl-module-time-hires += "perl-module-exporter"
RDEPENDS_perl-module-time-local += "perl-module-exporter"
RDEPENDS_perl-module-time-piece += "perl-module-dynaloader"
RDEPENDS_perl-module-time-piece += "perl-module-exporter"
RDEPENDS_perl-module-unicode-collate += "perl-module-dynaloader"
RDEPENDS_perl-module-unicode-normalize += "perl-module-dynaloader"
RDEPENDS_perl-module-unicode-normalize += "perl-module-exporter"
RDEPENDS_perl-module-unicode-ucd += "perl-module-exporter"

View File

@ -7,23 +7,25 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
# We need gnugrep (for -I)
DEPENDS = "virtual/db grep-native"
DEPENDS += "gdbm zlib"
PR = "r5"
PR = "r0"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
# Major part of version
#PVM = "5.13"
SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://debian/arm_thread_stress_timeout.diff \
file://debian/cpan_config_path.diff \
file://debian/cpan_definstalldirs.diff \
file://debian/db_file_ver.diff \
file://debian/doc_info.diff \
file://debian/enc2xs_inc.diff \
file://debian/errno_ver.diff \
file://debian/extutils_hacks.diff \
file://debian/libperl_embed_doc.diff \
file://debian/fixes/respect_umask.diff \
file://debian/writable_site_dirs.diff \
file://debian/extutils_set_libperl_path.diff \
file://debian/no_packlist_perllocal.diff \
file://debian/prefix_changes.diff \
file://debian/fakeroot.diff \
file://debian/instmodsh_doc.diff \
file://debian/ld_run_path.diff \
file://debian/libnet_config_path.diff \
@ -32,31 +34,26 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://debian/module_build_man_extensions.diff \
file://debian/prune_libs.diff \
file://debian/fixes/net_smtp_docs.diff \
file://debian/fixes/processPL.diff \
file://debian/perlivp.diff \
file://debian/disable-zlib-bundling.diff \
file://debian/cpanplus_definstalldirs.diff \
file://debian/cpanplus_config_path.diff \
file://debian/fixes/autodie-flock.diff \
file://debian/devel-ppport-ia64-optim.diff \
file://debian/fixes/cpanplus-without-home.diff \
file://debian/arm_optim.diff \
file://debian/deprecate-with-apt.diff \
file://debian/fixes/hurd-ccflags.diff \
file://debian/squelch-locale-warnings.diff \
file://debian/fixes/lc-numeric-docs.diff \
file://debian/fixes/lc-numeric-sprintf.diff \
file://debian/fixes/concat-stack-corruption.diff \
file://debian/fixes/h2ph-gcc-4.5.diff \
file://debian/patchlevel \
file://debian/skip-upstream-git-tests.diff \
file://debian/fixes/extutils-cbuilder-cflags.diff \
file://debian/fixes/module-build-home-directory.diff \
file://debian/fixes/h2ph-multiarch.diff \
file://debian/fixes/index-tainting.diff \
file://debian/skip-kfreebsd-crash.diff \
file://debian/fixes/document_makemaker_ccflags.diff \
file://debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch \
file://debian/fixes/hurd-hints.diff \
file://debian/fixes/pod_fixes.diff \
file://debian/find_html2text.diff \
\
file://Makefile.patch \
file://parallel_build_fix_1.patch \
file://parallel_build_fix_2.patch \
file://parallel_build_fix_3.patch \
file://parallel_build_fix_4.patch \
file://parallel_build_fix_5.patch \
file://parallel_build_fix_6.patch \
file://Makefile.SH.patch \
file://installperl.patch \
file://perl-dynloader.patch \
@ -78,8 +75,8 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://config.sh-64-be"
# file://debian/fakeroot.diff
SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
SRC_URI[md5sum] = "3306fbaf976dcebdcd49b2ac0be00eb9"
SRC_URI[sha256sum] = "6488359573bd7d41761bf935f66f827dc220fb3df961ef9b775d51fbd66548d3"
inherit perlnative siteinfo
@ -220,8 +217,6 @@ perl_package_preprocess () {
-e "s,${STAGING_BINDIR_NATIVE}/,,g" \
${PKGD}${bindir}/h2xs \
${PKGD}${bindir}/h2ph \
${PKGD}${bindir}/pod2html \
${PKGD}${bindir}/pod2latex \
${PKGD}${bindir}/pod2man \
${PKGD}${bindir}/pod2text \
${PKGD}${bindir}/pod2usage \