perl 5.20.0 -> 5.22.0 and fix test cases

deleted file mode 100644
index b1787ce..0000000
@@ -1,47 +0,0 @@
-From 2ed4b0c66fe7c7282922798eb3271b8f101359d1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Thu, 19 Jun 2014 19:34:56 +0800
-Subject: [PATCH] Makefile.SH: fix do_install failed
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- Makefile.SH | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/Makefile.SH b/Makefile.SH
-index f5d2d0f..e468c1b 100755
---- a/Makefile.SH
-+++ b/Makefile.SH
-@@ -1074,8 +1074,7 @@ EOT
-         $spitshell >>$Makefile <<EOT
- 
- install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
--	\$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS)
--	\$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags
-+	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags  \$(INSTALLFLAGS) \$(STRIPFLAGS)
- EOT
-     fi
- 
-@@ -1104,19 +1103,6 @@ else
- 	$spitshell >>$Makefile <<'!NO!SUBS!'
- install.perl:	$(INSTALL_DEPENDENCE) installperl
- 	./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
--
--# XXX Experimental. Hardwired values, but useful for testing.
--# Eventually Configure could ask for some of these values.
--install.html: all installhtml
--	-@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
--	$(RUN_PERL) installhtml   \
--      --podroot=. --podpath=. --recurse  \
--      --htmldir=$(privlib)/html   \
--      --htmlroot=$(privlib)/html  \
--      --splithead=pod/perlipc     \
--      --splititem=pod/perlfunc    \
--      --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
--      --verbose
- !NO!SUBS!
- fi
- 
--- 
-1.8.1.2
-

deleted file mode 100644
index 66208a2..0000000
@@ -1,32 +0,0 @@
-From 651aaac47361c03d15681b6cfdba0056a348fbb7 Mon Sep 17 00:00:00 2001
-From: Dominic Hargreaves <[email protected]>
-Date: Sun, 27 Nov 2011 16:27:07 +0000
-Subject: Disable failing GNU/Hurd tests dist/threads/t/stack.t
-
-These tests fail on GNU/Hurd owing to libpthread using fixed-size stacks.
-This is a known limitation that should get fixed in the future.
-
-For now, disable the tests.
-
-Bug-Debian: http://bugs.debian.org/650175
-
-Patch-Name: debian/hurd_test_skip_stack.diff
----
- dist/threads/t/stack.t | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dist/threads/t/stack.t b/dist/threads/t/stack.t
-index cfd6cf7..84cc527 100644
---- a/dist/threads/t/stack.t
-+++ b/dist/threads/t/stack.t
-@@ -7,6 +7,10 @@ BEGIN {
-         print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
-         exit(0);
-     }
-+    if ($^O eq 'gnu') {
-+        print("1..0 # SKIP fails on GNU/Hurd (Debian #650175)\n");
-+        exit(0);
-+    }
- }
- 
- use ExtUtils::testlib;

deleted file mode 100644
index 894e953..0000000
@@ -1,35 +0,0 @@
-From 333efa7c9da43d94272a872a59a6cd28da8ca245 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <[email protected]>
-Date: Thu, 8 May 2008 14:32:33 +0300
-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 file 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 84e137f..4422cd4 100644
---- a/cpan/Module-Build/lib/Module/Build/Base.pm
-+++ b/cpan/Module-Build/lib/Module/Build/Base.pm
-@@ -3226,7 +3226,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).
--    my $parser  = Pod::Man->new( %podman_args );
-+    my $parser  = Pod::Man->new( %podman_args, section => '1p' ); # binaries go in section 1p
-     my $manpage = $self->man1page_name( $file ) . '.' .
-                   $self->config( 'man1ext' );
-     my $outfile = File::Spec->catfile($mandir, $manpage);
-@@ -3252,7 +3252,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).
--    my $parser  = Pod::Man->new( %podman_args );
-+    my $parser  = Pod::Man->new( %podman_args, section => '3pm' ); # libraries go in section 3pm
-     my $manpage = $self->man3page_name( $relfile ) . '.' .
-                   $self->config( 'man3ext' );
-     my $outfile = File::Spec->catfile( $mandir, $manpage);

93 lines not on this page · raw message

deleted file mode 100644
index 9ec041c..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Backport
-Reference: https://rt.perl.org/Public/Bug/Display.html?id=123591
-  From 62db6ea5fed19611596cbc5fc0b8a4df2c604e58 Mon Sep 17 00:00:00 2001
-  From: Tony Cook <[email protected]>
-  Date: Mon, 19 Jan 2015 16:03:18 +1100
-  Subject: [PATCH 1/1] [perl #123538] always set chophere and itembytes at the same time
-
-  Previously this would crash in FF_MORE because chophere was still NULL.
-
-Signed-off-by: Gary Thomas <[email protected]>
-Index: perl-5.20.0/pp_ctl.c
-===================================================================
---- perl-5.20.0.orig/pp_ctl.c
-+++ perl-5.20.0/pp_ctl.c
-@@ -590,6 +590,7 @@ PP(pp_formline)
-                         break;
-                 }
-                 itembytes = s - item;
-+                chophere = s;
- 		break;
- 	    }

94 lines not on this page · raw message

45 lines not on this page · raw message

similarity index 92%
rename from meta/recipes-devtools/perl/perl-native_5.20.0.bb
rename to meta/recipes-devtools/perl/perl-native_5.22.0.bb
index 586a347..dbfd82d 100644
@@ -6,10 +6,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+"
 LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
                     file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
 
-# 5.10.1 has Module::Build built-in
-PROVIDES += "libmodule-build-perl-native"
-
-SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
+SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \
            file://Configure-multilib.patch \
            file://perl-configpm-switch.patch \
            file://native-nopacklist.patch \

@@ -17,10 +14,10 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
            file://MM_Unix.pm.patch \
            file://debian/errno_ver.diff \
            file://dynaloaderhack.patch \
-           file://perl-5.14.3-fix-CVE-2010-4777.patch "
+          "
 
-SRC_URI[md5sum] = "406ec049ebe3afcc80d9c76ec78ca4f8"
-SRC_URI[sha256sum] = "4e8c28ad6ecc89902f9cb2e76f2815bb1a8287ded278e15f7a36ca45f8bbcd02"
+SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79"
+SRC_URI[sha256sum] = "be83ead0c5c26cbbe626fa4bac1a4beabe23a9eebc15d35ba49ccde11878e196"
 
 S = "${WORKDIR}/perl-${PV}"
 

625 lines not on this page · raw message

49 lines not on this page · raw message

deleted file mode 100644
index 9a648db..0000000
@@ -1 +0,0 @@
-RPROVIDES_perl-module-module-build += "libmodule-build-perl"

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/Configure-multilib.patch
rename to meta/recipes-devtools/perl/perl/Configure-multilib.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/MM_Unix.pm.patch
rename to meta/recipes-devtools/perl/perl/MM_Unix.pm.patch

323 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/Makefile.patch
rename to meta/recipes-devtools/perl/perl/Makefile.patch

882 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/config.sh-32
rename to meta/recipes-devtools/perl/perl/config.sh-32

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-be
rename to meta/recipes-devtools/perl/perl/config.sh-32-be

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/config.sh-32-le
rename to meta/recipes-devtools/perl/perl/config.sh-32-le

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/config.sh-64
rename to meta/recipes-devtools/perl/perl/config.sh-64

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-be
rename to meta/recipes-devtools/perl/perl/config.sh-64-be

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/config.sh-64-le
rename to meta/recipes-devtools/perl/perl/config.sh-64-le

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/cross-generate_uudmap.patch
rename to meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/cpan-missing-site-dirs.diff
rename to meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
index a5eb71e..a63b968 100644
@@ -1,4 +1,4 @@
-From 25994ac1124566398adee13806ef9a73d2cae150 Mon Sep 17 00:00:00 2001
+From d33d46963035ef726144dc66be2ae9c00aec0333 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Tue, 16 Oct 2012 23:07:56 +0300
 Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent

@@ -18,10 +18,10 @@ Patch-Name: debian/cpan-missing-site-dirs.diff
  1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 4416072..187f5c4 100644
+index 33054cd..7b0becf 100644
 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm
 +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -2045,11 +2045,34 @@ sub _print_urllist {
+@@ -2057,11 +2057,34 @@ sub _print_urllist {
      };
  }
  

similarity index 89%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/cpan_definstalldirs.diff
rename to meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
index 77a2ee9..6b52950 100644
@@ -1,4 +1,4 @@
-From 64c9ad40c26f051a275a8b963cc849ca0ddd3cbb Mon Sep 17 00:00:00 2001
+From 5ff1f21484aab68efe321ff4ba5d35928f72af96 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Provide a sensible INSTALLDIRS default for modules installed from

@@ -14,10 +14,10 @@ Patch-Name: debian/cpan_definstalldirs.diff
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index d1a8eef..4416072 100644
+index 918e009..33054cd 100644
 --- a/cpan/CPAN/lib/CPAN/FirstTime.pm
 +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -1023,7 +1023,7 @@ sub init {
+@@ -1024,7 +1024,7 @@ sub init {
      my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
  
      if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {

@@ -26,7 +26,7 @@ index d1a8eef..4416072 100644
          my_dflt_prompt(make_arg => "", $matcher);
          if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
              $CPAN::Frontend->mywarn(
-@@ -1055,7 +1055,7 @@ sub init {
+@@ -1056,7 +1056,7 @@ sub init {
      my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
                     $matcher);
  

similarity index 94%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff
rename to meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
index 9557560..280bf11 100644
@@ -1,4 +1,4 @@
-From 4da39e2ce6c5a510409c2da1c7b24e0e7ff87f31 Mon Sep 17 00:00:00 2001
+From 01421f8a80d5c623959695ba2b8167f30112d333 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
 Subject: Remove overly restrictive DB_File version check.

56 lines not on this page · raw message

similarity index 85%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/doc_info.diff
rename to meta/recipes-devtools/perl/perl/debian/doc_info.diff
index 7643759..fbea2ee 100644
@@ -1,4 +1,4 @@
-From 2f3e4b35da039600de403083b5a0c7391751d02e Mon Sep 17 00:00:00 2001
+From e18f81e69c55d698abd293e71063d6b6b275cc07 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
 Subject: Replace generic man(1) instructions with Debian-specific information.

@@ -11,10 +11,10 @@ Patch-Name: debian/doc_info.diff
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/pod/perl.pod b/pod/perl.pod
-index 2e8d0d8..8810769 100644
+index 364e957..f97e103 100644
 --- a/pod/perl.pod
 +++ b/pod/perl.pod
-@@ -274,8 +274,16 @@ aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp
+@@ -291,8 +291,16 @@ aux c2ph h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp
  
  =for buildtoc __END__
  

similarity index 87%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/enc2xs_inc.diff
rename to meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
index 4650b0b..e074b20 100644
@@ -1,4 +1,4 @@
-From 98e7248580af353d781b24715b42af5b6a4caf35 Mon Sep 17 00:00:00 2001
+From 7fe59a3d0601c6d8634eae4f99dae3024cd02a92 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
 Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.

@@ -17,10 +17,10 @@ Patch-Name: debian/enc2xs_inc.diff
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index c44487d..a9af54f 100644
+index 19f2b2b..4d64e38 100644
 --- a/cpan/Encode/bin/enc2xs
 +++ b/cpan/Encode/bin/enc2xs
-@@ -929,11 +929,11 @@ use vars qw(
+@@ -944,11 +944,11 @@ use vars qw(
  sub find_e2x{
      eval { require File::Find; };
      my (@inc, %e2x_dir);

@@ -34,7 +34,7 @@ index c44487d..a9af54f 100644
           my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
               $atime,$mtime,$ctime,$blksize,$blocks)
               = lstat($_) or return;
-@@ -943,7 +943,7 @@ sub find_e2x{
+@@ -958,7 +958,7 @@ sub find_e2x{
               $e2x_dir{$File::Find::dir} ||= $mtime;
           }
           return;

@@ -43,7 +43,7 @@ index c44487d..a9af54f 100644
      warn join("\n", keys %e2x_dir), "\n";
      for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
      $_E2X = $d;
-@@ -1010,7 +1010,7 @@ sub make_configlocal_pm {
+@@ -1025,7 +1025,7 @@ sub make_configlocal_pm {
  	    $LocalMod{$enc} ||= $mod;
  	}
      };

@@ -53,10 +53,10 @@ index c44487d..a9af54f 100644
      for my $enc ( sort keys %LocalMod ) {
          $_ModLines .=
 diff --git a/t/porting/customized.t b/t/porting/customized.t
-index a769c58..6b9977f 100644
+index 45fcafb..3bd6adb 100644
 --- a/t/porting/customized.t
 +++ b/t/porting/customized.t
-@@ -99,8 +99,11 @@ foreach my $module ( sort keys %Modules ) {
+@@ -101,8 +101,11 @@ foreach my $module ( sort keys %Modules ) {
        print $data_fh join(' ', $module, $file, $id), "\n";
        next;
      }

similarity index 87%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/errno_ver.diff
rename to meta/recipes-devtools/perl/perl/debian/errno_ver.diff
index d8885a7..bcb59c6 100644
@@ -1,4 +1,4 @@
-From 81255b67014bda2ec127e0856436acfa554a068c Mon Sep 17 00:00:00 2001
+From 827eee225897c35ec97194a5971bf4bfcf250748 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
 Subject: Remove Errno version check due to upgrade problems with long-running

@@ -16,10 +16,10 @@ Patch-Name: debian/errno_ver.diff
  1 file changed, 5 deletions(-)
 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 55ad01a..e4a31ef 100644
+index c6bfa06..519e5c7 100644
 --- a/ext/Errno/Errno_pm.PL
 +++ b/ext/Errno/Errno_pm.PL
-@@ -277,13 +277,8 @@ sub write_errno_pm {
+@@ -278,13 +278,8 @@ sub write_errno_pm {
  
  package Errno;
  require Exporter;

similarity index 87%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/extutils_set_libperl_path.diff
rename to meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
index 53fd1f6..adb4bd9 100644
@@ -1,4 +1,4 @@
-From 2870b992e4b5e8bb0b9c44c9aff81adaaf9de439 Mon Sep 17 00:00:00 2001
+From 431275078b0490d2e092442d9582be06bb95b354 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Sat, 10 May 2014 23:34:14 +0300
 Subject: EU:MM: set location of libperl.a under /usr/lib

@@ -13,10 +13,10 @@ Patch-Name: debian/extutils_set_libperl_path.diff
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 8b86a24..f977476 100644
+index 5f1b87f..570a631 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -2462,7 +2462,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
+@@ -2505,7 +2505,7 @@ MAP_PRELIBS   = $Config{perllibs} $Config{cryptlib}
  	($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
      }
      unless ($libperl && -f $lperl) { # Ilya's code...

@@ -26,7 +26,7 @@ index 8b86a24..f977476 100644
  	$libperl ||= "libperl$self->{LIB_EXT}";
  	$libperl   = "$dir/$libperl";
 diff --git a/pp.c b/pp.c
-index 4ec6887..a44c137 100644
+index 42f156a..77c1279 100644
 --- a/pp.c
 +++ b/pp.c
 @@ -1,4 +1,4 @@

42 lines not on this page · raw message

similarity index 89%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/find_html2text.diff
rename to meta/recipes-devtools/perl/perl/debian/find_html2text.diff
index c0e1949..d319e75 100644
@@ -1,4 +1,4 @@
-From 8deb14b24ee17694a2f23a78e8782b24c116daae Mon Sep 17 00:00:00 2001
+From c81dbdedff9e9b4fb75ac028aa718838c0292d2f Mon Sep 17 00:00:00 2001
 From: Andreas Marschke <[email protected]>
 Date: Sat, 17 Sep 2011 11:38:42 +0100
 Subject: Configure CPAN::Distribution with correct name of html2text

@@ -21,10 +21,10 @@ functionality].
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
-index 9a08707..332a627 100644
+index 092b781..5c2bae1 100644
 --- a/cpan/CPAN/lib/CPAN/Distribution.pm
 +++ b/cpan/CPAN/lib/CPAN/Distribution.pm
-@@ -4031,7 +4031,7 @@ sub _display_url {
+@@ -4099,7 +4099,7 @@ sub _display_url {
        if $CPAN::DEBUG;
  
      # should we define it in the config instead?

similarity index 87%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/document_makemaker_ccflags.diff
rename to meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
index f4050c0..61a9271 100644
@@ -1,4 +1,4 @@
-From c7ffe0cc3105cb627fbbb7d0c7dbb53f1f236a17 Mon Sep 17 00:00:00 2001
+From 9faf6dcc3a5c4154484d812eb3cc3dd78b35563b Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Mon, 30 May 2011 22:54:24 +0300
 Subject: Document that CCFLAGS should include $Config{ccflags}

@@ -15,10 +15,10 @@ Patch-Name: fixes/document_makemaker_ccflags.diff
  1 file changed, 4 insertions(+)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-index d2fabf6..fabb021 100644
+index fe95b27..90403e8 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-@@ -1716,6 +1716,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs.
+@@ -1774,6 +1774,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.
  

similarity index 98%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/memoize_storable_nstore.diff
rename to meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
index b9d61c7..525f962 100644
@@ -1,4 +1,4 @@
-From 8b7b31d6b2368717514a05dc0e968c1357511733 Mon Sep 17 00:00:00 2001
+From 55d430eb02fc116581847304ca20321687978269 Mon Sep 17 00:00:00 2001
 From: Jonathan Nieder <[email protected]>
 Date: Fri, 27 Jul 2012 10:35:07 -0500
 Subject: Memoize::Storable: respect 'nstore' option not respected

similarity index 58%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/fixes/net_smtp_docs.diff
rename to meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
index b7ccc57..3c31972 100644
@@ -1,4 +1,4 @@
-From e2e1127a521d942bd9aea4c1290cdf46c15c35fd Mon Sep 17 00:00:00 2001
+From fa085fedd9c406edcd4a1a256c025d5ff7f6c6de Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Thu, 20 Sep 2007 19:47:14 +1000
 Subject: Document the Net::SMTP 'Port' option

@@ -8,14 +8,14 @@ Bug: http://rt.cpan.org/Public/Bug/Display.html?id=36038
 
 Patch-Name: fixes/net_smtp_docs.diff
 ---
- cpan/libnet/Net/SMTP.pm | 1 +
+ cpan/libnet/lib/Net/SMTP.pm | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
-index 705b5c5..17c1d21 100644
---- a/cpan/libnet/Net/SMTP.pm
-+++ b/cpan/libnet/Net/SMTP.pm
-@@ -637,6 +637,7 @@ Net::SMTP will attempt to extract the address from the value passed.
+diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm
+index afd017a..6ae7d9e 100644
+--- a/cpan/libnet/lib/Net/SMTP.pm
++++ b/cpan/libnet/lib/Net/SMTP.pm
+@@ -738,6 +738,7 @@ Net::SMTP will attempt to extract the address from the value passed.
  
  B<Debug> - Enable debugging information
  

73 lines not on this page · raw message

170 lines not on this page · raw message

51 lines not on this page · raw message

109 lines not on this page · raw message

13 lines not on this page · raw message

new file mode 100644
index 0000000..fbd7b9d

Lines of this file are not shown. View the raw message.

156 lines not on this page · raw message

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/instmodsh_doc.diff
rename to meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
index 569acb8..a62c746 100644

Lines of this file are not shown. View the raw message.

similarity index 84%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/ld_run_path.diff
rename to meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
index fa0039f..d80f86c 100644

Lines of this file are not shown. View the raw message.

similarity index 74%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/libnet_config_path.diff
rename to meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
index 0a11cd7..54ef964 100644

Lines of this file are not shown. View the raw message.

similarity index 92%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/libperl_embed_doc.diff
rename to meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
index 7b9bd75..76b8054 100644

Lines of this file are not shown. View the raw message.

52 lines not on this page · raw message

new file mode 100644
index 0000000..fa0f9da

Lines of this file are not shown. View the raw message.

42 lines not on this page · raw message

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/mod_paths.diff
rename to meta/recipes-devtools/perl/perl/debian/mod_paths.diff
index 49805a0..ae15907 100644

Lines of this file are not shown. View the raw message.

92 lines not on this page · raw message

new file mode 100644
index 0000000..8656b02

Lines of this file are not shown. View the raw message.

similarity index 87%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/perl5db-x-terminal-emulator.patch
rename to meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
index 82a9f1a..533952c 100644

Lines of this file are not shown. View the raw message.

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/perlivp.diff
rename to meta/recipes-devtools/perl/perl/debian/perlivp.diff
index 60a714f..2c1eab9 100644

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..6270b87

Lines of this file are not shown. View the raw message.

similarity index 89%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/prefix_changes.diff
rename to meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
index 535a90d..c41efbe 100644

Lines of this file are not shown. View the raw message.

similarity index 78%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/prune_libs.diff
rename to meta/recipes-devtools/perl/perl/debian/prune_libs.diff
index 50bcc47..b4443f6 100644

Lines of this file are not shown. View the raw message.

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/regen-skip.diff
rename to meta/recipes-devtools/perl/perl/debian/regen-skip.diff
index 50bc97c..8a3fc99 100644

Lines of this file are not shown. View the raw message.

similarity index 91%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/skip-kfreebsd-crash.diff
rename to meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
index f7cc555..ecfc0bc 100644

Lines of this file are not shown. View the raw message.

similarity index 80%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/skip-upstream-git-tests.diff
rename to meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
index 7110298..4c87104 100644

Lines of this file are not shown. View the raw message.

similarity index 59%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/squelch-locale-warnings.diff
rename to meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
index 5c19004..cb31457 100644

Lines of this file are not shown. View the raw message.

similarity index 61%
rename from meta/recipes-devtools/perl/perl-5.20.0/debian/writable_site_dirs.diff
rename to meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
index f73f8bb..53adc2f 100644

Lines of this file are not shown. View the raw message.

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/dynaloaderhack.patch
rename to meta/recipes-devtools/perl/perl/dynaloaderhack.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/fix_bad_rpath.patch
rename to meta/recipes-devtools/perl/perl/fix_bad_rpath.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/generate-sh.patch
rename to meta/recipes-devtools/perl/perl/generate-sh.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/installperl.patch
rename to meta/recipes-devtools/perl/perl/installperl.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/letgcc-find-errno.patch
rename to meta/recipes-devtools/perl/perl/letgcc-find-errno.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
rename to meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch

91 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/native-perlinc.patch
rename to meta/recipes-devtools/perl/perl/native-perlinc.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/perl-archlib-exp.patch
rename to meta/recipes-devtools/perl/perl/perl-archlib-exp.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/perl-configpm-switch.patch
rename to meta/recipes-devtools/perl/perl/perl-configpm-switch.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/perl-configure.sh
rename to meta/recipes-devtools/perl/perl/perl-configure.sh

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/perl-dynloader.patch
rename to meta/recipes-devtools/perl/perl/perl-dynloader.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/perl-enable-gdbm.patch
rename to meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/perl-moreconfig.patch
rename to meta/recipes-devtools/perl/perl/perl-moreconfig.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/run-ptest
rename to meta/recipes-devtools/perl/perl/run-ptest

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/test/dist-threads-t-join.t-adjust-ps-option.patch
rename to meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.20.0/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
rename to meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch

similarity index 96%
rename from meta/recipes-devtools/perl/perl_5.20.0.bb
rename to meta/recipes-devtools/perl/perl_5.22.0.bb
index d100ff9..8022f47 100644

Lines of this file are not shown. View the raw message.

index 2eb8162..4f648a6 100644
@@ -10,22 +10,6 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
 export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
 export LD = "${CCLD}"
 
-#
-# We also need to have built libmodule-build-perl-native for
-# everything except libmodule-build-perl-native itself (which uses
-# this class, but uses itself as the provider of
-# libmodule-build-perl)
-#
-def cpan_build_dep_prepend(d):
-	if d.getVar('CPAN_BUILD_DEPS', True):
-		return ''
-	pn = d.getVar('PN', True)
-	if pn in ['libmodule-build-perl', 'libmodule-build-perl-native']:
-		return ''
-	return 'libmodule-build-perl-native '
-
-DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
-
 cpan_build_do_configure () {
 	if [ "${@is_target(d)}" = "yes" ]; then
 		# build for target

index dbfd82d..488871a 100644
@@ -1,12 +1,6 @@
-SUMMARY = "Perl scripting language"
-HOMEPAGE = "http://www.perl.org/"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
+require perl.inc
 
-LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
-                    file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
-
-SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \
+SRC_URI += "\
            file://Configure-multilib.patch \
            file://perl-configpm-switch.patch \
            file://native-nopacklist.patch \

@@ -19,8 +13,6 @@ SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \
 SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79"
 SRC_URI[sha256sum] = "be83ead0c5c26cbbe626fa4bac1a4beabe23a9eebc15d35ba49ccde11878e196"
 
-S = "${WORKDIR}/perl-${PV}"
-
 inherit native
 
 NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"

new file mode 100644
index 0000000..0d9716c
@@ -0,0 +1,8 @@
+SUMMARY = "Perl scripting language"
+HOMEPAGE = "http://www.perl.org/"
+SECTION = "devel"
+LICENSE = "Artistic-1.0 | GPL-1.0+"
+LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
+		    file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
+
+SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz"

index 8022f47..e749078 100644
@@ -1,16 +1,9 @@
-SUMMARY = "Perl scripting language"
-HOMEPAGE = "http://www.perl.org/"
-SECTION = "devel"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
-		    file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3"
+require perl.inc
+
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
 
-SRC_URI = "http://www.cpan.org/src/5.0/${BP}.tar.xz \
-"
-
 # Pick up patches from debian
 # http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.22.0-1.debian.tar.xz
 SRC_URI += " \

@@ -54,11 +47,9 @@ SRC_URI += " \
         file://native-perlinc.patch \
         file://perl-enable-gdbm.patch \
         file://cross-generate_uudmap.patch \
-	file://fix_bad_rpath.patch \
-	file://perl-archlib-exp.patch \
-	file://dynaloaderhack.patch \
-	\
-        \
+        file://fix_bad_rpath.patch \
+        file://perl-archlib-exp.patch \
+        file://dynaloaderhack.patch \
         file://config.sh \
         file://config.sh-32 \
         file://config.sh-32-le \

new file mode 100644
index 0000000..03fdf4a
@@ -0,0 +1,30 @@
+From 1561549ea36e37cc25706f094a195de4928f4211 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Fri, 19 Jun 2015 01:23:46 -0700
+Subject: [PATCH] t/run/switches.t: perl5 -> perl
+
+We call it perl rather than perl5 in oe.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ t/run/switches.t |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/run/switches.t b/t/run/switches.t
+index 78915e0..e9e4b45 100644
+--- a/t/run/switches.t
++++ b/t/run/switches.t
+@@ -269,7 +269,7 @@ is runperl(stderr => 1, prog => '#!perl -M'),
+           '-V generates 20+ lines' );
+ 
+     like( runperl( switches => ['-V'] ),
+-	  qr/\ASummary of my perl5 .*configuration:/,
++	  qr/\ASummary of my perl .*configuration:/,
+           '-V looks okay' );
+ 
+     # lookup a known config var
+-- 
+1.7.9.5
+

index e749078..da3dba6 100644
@@ -58,6 +58,7 @@ SRC_URI += " \
         file://config.sh-64-le \
         file://config.sh-64-be \
         file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
+        file://t-run-switches.t-perl5-perl.patch \
 "
 
 # Fix test case issues

new file mode 100644
index 0000000..994ef70
@@ -0,0 +1,35 @@
+From ba4ed0b5b7baad5353c1e65b655f41d45e01c990 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Mon, 22 Jun 2015 20:00:11 -0700
+Subject: [PATCH] ext/ODBM_File/hints/linux.pl: link libgdbm_compat
+
+Fixed for test case ../ext/ODBM_File/t/odbm.t:
+ok 1 - use ODBM_File;
+ok 2 - use Fcntl;
+./perl: symbol lookup error: /usr/lib/perl/5.22.0/auto/ODBM_File/ODBM_File.so: undefined symbol: dbminit
+
+The checking "if -e $_.'/libgdbm_compat.so'" doesn't work when cross
+build, so always link libgdbm_compat, since perl depends on gdbm and we
+always have libgdbm_compat.
+
+Upstream-Status:Inappropriate [embedded specific]
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ ext/ODBM_File/hints/linux.pl |    6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/ext/ODBM_File/hints/linux.pl b/ext/ODBM_File/hints/linux.pl
+index 204bba0..9271b45 100644
+--- a/ext/ODBM_File/hints/linux.pl
++++ b/ext/ODBM_File/hints/linux.pl
+@@ -1,8 +1,2 @@
+ # uses GDBM dbm compatibility feature - at least on SuSE 8.0
+-$self->{LIBS} = ['-lgdbm'];
+-
+-# Debian/Ubuntu have libgdbm_compat.so but not this file,
+-# so linking may fail
+-foreach (split / /, $Config{libpth}) {
+-    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
+-}
++$self->{LIBS} = ['-lgdbm -lgdbm_compat'];

index da3dba6..7c70414 100644
@@ -59,6 +59,7 @@ SRC_URI += " \
         file://config.sh-64-be \
         file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
         file://t-run-switches.t-perl5-perl.patch \
+        file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \
 "
 
 # Fix test case issues

new file mode 100644
index 0000000..6b05b87
@@ -0,0 +1,31 @@
+From b842e1de7798a1f7df770bb3f185ad3356e490e6 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Mon, 22 Jun 2015 20:06:56 -0700
+Subject: [PATCH] ext/ODBM_File/t/odbm.t: fix the  path of dbmt_common.pl
+
+It should be lib/dbmt_common.pl when run by run-ptest.
+
+Fixed:
+Can't locate ../../t/lib/dbmt_common.pl in @INC
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ ext/ODBM_File/t/odbm.t |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/ODBM_File/t/odbm.t b/ext/ODBM_File/t/odbm.t
+index 079b9f1..250b991 100644
+--- a/ext/ODBM_File/t/odbm.t
++++ b/ext/ODBM_File/t/odbm.t
+@@ -2,7 +2,7 @@
+ 
+ our $DBM_Class = 'ODBM_File';
+ 
+-require '../../t/lib/dbmt_common.pl';
++require 'lib/dbmt_common.pl';
+ 
+ if ($^O eq 'hpux') {
+     print <<EOM;
+-- 
+1.7.9.5
+

index 7c70414..1aa9737 100644
@@ -60,6 +60,7 @@ SRC_URI += " \
         file://make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch \
         file://t-run-switches.t-perl5-perl.patch \
         file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \
+        file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \
 "
 
 # Fix test case issues

index d80f0c0..9fb5042 100644
@@ -83,7 +83,6 @@ bin_ELF='define'
 binexp='@USRBIN@'
 bison='bison'
 byacc='byacc'
-byteorder='12345678'
 c=''
 castflags='0'
 cat='cat'

index 948ea7c..74ac110 100644
@@ -34,4 +34,5 @@ python populate_packages_prepend() {
             '${PN}-ptest%s', '%s', recursive=True, match_path=True)
 }
 
-RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc sed"
+RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc sed make gcc \
+                         procps libgcc-dev gcc-dev gdbm perl-dev libssp libssp-dev"

index 2331d1d..af01b6c 100644
@@ -17,3 +17,13 @@ SRC_URI[sha256sum] = "cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a
 inherit autotools texinfo
 
 BBCLASSEXTEND = "native nativesdk"
+
+do_install_append () {
+    install -d ${D}${includedir}/gdbm
+    install -m 0644 ${S}/dbm.h ${D}${includedir}/
+    install -m 0644 ${S}/ndbm.h ${D}${includedir}/
+    # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find
+    # these headers
+    ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h
+    ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h
+}