[PATCH 1/3] perl: bump to version 5.20.1

classic Classic list List threaded Threaded
12 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/3] perl: bump to version 5.20.1

Francois Perrad
Signed-off-by: Francois Perrad <[hidden email]>
---
 package/perl/perl-uClibc-IPv6.patch | 10 +++++-----
 package/perl/perl.mk                | 11 +++++++----
 support/scripts/scancpan            |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/package/perl/perl-uClibc-IPv6.patch b/package/perl/perl-uClibc-IPv6.patch
index 8ace75e..b29d373 100644
--- a/package/perl/perl-uClibc-IPv6.patch
+++ b/package/perl/perl-uClibc-IPv6.patch
@@ -6,7 +6,7 @@ Index: b/cpan/Socket/Socket.xs
 ===================================================================
 --- a/cpan/Socket/Socket.xs
 +++ b/cpan/Socket/Socket.xs
-@@ -896,7 +896,7 @@
+@@ -920,7 +920,7 @@
  CODE:
  #ifdef HAS_INETNTOP
  STRLEN addrlen;
@@ -15,7 +15,7 @@ Index: b/cpan/Socket/Socket.xs
  struct in6_addr addr;
  char str[INET6_ADDRSTRLEN];
  #else
-@@ -916,7 +916,7 @@
+@@ -940,7 +940,7 @@
  croak("Bad address length for Socket::inet_ntop on AF_INET;"
       " got %"UVuf", should be 4", (UV)addrlen);
     break;
@@ -24,7 +24,7 @@ Index: b/cpan/Socket/Socket.xs
   case AF_INET6:
     if(addrlen != 16)
  croak("Bad address length for Socket::inet_ntop on AF_INET6;"
-@@ -925,7 +925,7 @@
+@@ -949,7 +949,7 @@
  #endif
   default:
  croak("Bad address family for %s, got %d, should be"
@@ -33,7 +33,7 @@ Index: b/cpan/Socket/Socket.xs
       " either AF_INET or AF_INET6",
  #else
       " AF_INET",
-@@ -955,7 +955,7 @@
+@@ -979,7 +979,7 @@
  #ifdef HAS_INETPTON
  int ok;
  int addrlen = 0;
@@ -42,7 +42,7 @@ Index: b/cpan/Socket/Socket.xs
  struct in6_addr ip_address;
  #else
  struct in_addr ip_address;
-@@ -965,14 +965,14 @@
+@@ -989,14 +989,14 @@
   case AF_INET:
     addrlen = 4;
     break;
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 65c0a7d..c355dc0 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -4,16 +4,16 @@
 #
 ################################################################################
 
-PERL_VERSION_MAJOR = 18
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
+PERL_VERSION_MAJOR = 20
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_LICENSE = Artistic or GPLv1+
 PERL_LICENSE_FILES = Artistic Copying README
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 0.8.5
-PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).2
+PERL_CROSS_VERSION = 0.9.2
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
 # DO NOT refactor with the github helper (the result is not the same)
 PERL_CROSS_SITE    = http://raw.github.com/arsv/perl-cross/releases
 PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
@@ -116,7 +116,10 @@ endef
 #
 define PERL_ADD_CORE_H
  touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/patchlevel-debian.h
+ touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/patchlevel-gentoo.h
  touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/cc_runtime.h
+ touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/fakethr.h
+ touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/perlsfio.h
  touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/vutil.h
 endef
 
diff --git a/support/scripts/scancpan b/support/scripts/scancpan
index e738a83..f5612e3 100755
--- a/support/scripts/scancpan
+++ b/support/scripts/scancpan
@@ -471,7 +471,7 @@ unshift @INC, sub {
 } # END OF FATPACK CODE
 
 
-use 5.018;      # same major version as target perl
+use 5.020;      # same major version as target perl
 use strict;
 use warnings;
 use Fatal qw(open close);
--
1.9.1

_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/3] perl: add hash

Francois Perrad
Signed-off-by: Francois Perrad <[hidden email]>
---
 package/perl/perl.hash | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 package/perl/perl.hash

diff --git a/package/perl/perl.hash b/package/perl/perl.hash
new file mode 100644
index 0000000..57fefd7
--- /dev/null
+++ b/package/perl/perl.hash
@@ -0,0 +1,4 @@
+# Hashes from: http://www.cpan.org/src/5.0/perl-5.20.1.tar.bz2.{md5,sha1,sha256}.txt
+md5    ede5166f949d9a07163bc5b086be9759                                 perl-5.20.1.tar.bz2
+sha1   cd424d1520ba2686fe5d4422565aaf880e9467f6                         perl-5.20.1.tar.bz2
+sha256 ede5ded37e7fb6139b04728cfca826f17076f9888dbfd100a56834dbeb04657c perl-5.20.1.tar.bz2
--
1.9.1

_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/3] support/script/scancpan: add option test

Francois Perrad
In reply to this post by Francois Perrad
test modules are usually useless on BR

Signed-off-by: Francois Perrad <[hidden email]>
---
 support/scripts/scancpan | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/support/scripts/scancpan b/support/scripts/scancpan
index f5612e3..a049e2c 100755
--- a/support/scripts/scancpan
+++ b/support/scripts/scancpan
@@ -483,7 +483,7 @@ use Module::CoreList;
 use HTTP::Tiny;
 use MetaCPAN::API::Tiny;
 
-my ($help, $man, $quiet, $force, $recommend, $host);
+my ($help, $man, $quiet, $force, $recommend, $test, $host);
 my $target = 1;
 GetOptions( 'help|?' => \$help,
             'man' => \$man,
@@ -491,7 +491,8 @@ GetOptions( 'help|?' => \$help,
             'force|f' => \$force,
             'host!' => \$host,
             'target!' => \$target,
-            'recommend' => \$recommend
+            'recommend' => \$recommend,
+            'test' => \$test
 ) or pod2usage(-exitval => 1);
 pod2usage(-exitval => 0) if $help;
 pod2usage(-exitval => 0, -verbose => 2) if $man;
@@ -554,11 +555,12 @@ sub fetch {
             next if $modname eq q{perl};
             next if $modname =~ m|^Alien|;
             next if $modname =~ m|^Win32|;
+            next if !$test && $modname =~ m|^Test|;
             next if Module::CoreList::first_release( $modname );
             # we could use the host Module::CoreList data, because host perl and
             # target perl have the same major version
             next if ${$dep}{phase} eq q{develop};
-            next if ${$dep}{phase} eq q{test};
+            next if !$test && ${$dep}{phase} eq q{test};
             next if !$recommend && ${$dep}{relationship} ne q{requires};
             my $distname = $mcpan->module( $modname )->{distribution};
             if (${$dep}{phase} eq q{runtime}) {
@@ -716,6 +718,7 @@ supports/scripts/scancpan [options] [distname ...]
    -target/-notarget
    -host/-nohost
    -recommend
+   -test
 
 =head1 OPTIONS
 
@@ -749,6 +752,10 @@ Switches package generation for the host variant (the default is C<-nohost>).
 
 Adds I<recommended> dependencies.
 
+=item B<-test>
+
+Adds dependencies for test.
+
 =back
 
 =head1 DESCRIPTION
--
1.9.1

_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 3/3] support/script/scancpan: add option test

Thomas Petazzoni-2
Dear Francois Perrad,

On Wed,  1 Oct 2014 20:36:59 +0200, Francois Perrad wrote:
> test modules are usually useless on BR
>
> Signed-off-by: Francois Perrad <[hidden email]>

Sorry for asking only now, but can we have a real commit message that
explains what's going on?

Something like:

"""
This commit adds a new -test option to the scancpan script, which
allows to ...
"""

With your current message "test modules are usually useless on BR", I
don't understand what this option does: does it disables test modules?
does it enables it? what does it change compared to the previous
situation?

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/3] perl: bump to version 5.20.1

Peter Korsgaard-3
In reply to this post by Francois Perrad
>>>>> "Francois" == Francois Perrad <[hidden email]> writes:

 > Signed-off-by: Francois Perrad <[hidden email]>

Committed, thanks.

--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/3] perl: add hash

Peter Korsgaard-3
In reply to this post by Francois Perrad
>>>>> "Francois" == Francois Perrad <[hidden email]> writes:

 > Signed-off-by: Francois Perrad <[hidden email]>

This belongs with the version bump, so I've squashed them together,
thanks.

--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 3/3] support/script/scancpan: add option test

François PERRAD
In reply to this post by Thomas Petazzoni-2
2014-10-01 21:34 GMT+02:00 Thomas Petazzoni
<[hidden email]>:

> Dear Francois Perrad,
>
> On Wed,  1 Oct 2014 20:36:59 +0200, Francois Perrad wrote:
>> test modules are usually useless on BR
>>
>> Signed-off-by: Francois Perrad <[hidden email]>
>
> Sorry for asking only now, but can we have a real commit message that
> explains what's going on?
>
> Something like:
>
> """
> This commit adds a new -test option to the scancpan script, which
> allows to ...
> """
>
> With your current message "test modules are usually useless on BR", I
> don't understand what this option does: does it disables test modules?
> does it enables it? what does it change compared to the previous
> situation?
>
> Best regards,
>

find below an improved message for this patch

"""
Between Perl modules, there are 3 kinds of dependency:
 - configure/build time dependency which becomes host dependency
 - runtime dependency which becomes target dependency
 - test time dependency which is useless in a cross-compiling context like BR

Before this patch, test time dependencies are handled like runtime dependencies.

After this patch, test time dependencies are ignored by default.
The new option -test allows to add them anyway.
"""

François.


> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> [hidden email]
> http://lists.busybox.net/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 3/3] support/script/scancpan: add option test

Thomas Petazzoni-2
Dear François Perrad,

On Fri, 3 Oct 2014 14:57:21 +0200, François Perrad wrote:

> find below an improved message for this patch
>
> """
> Between Perl modules, there are 3 kinds of dependency:
>  - configure/build time dependency which becomes host dependency
>  - runtime dependency which becomes target dependency
>  - test time dependency which is useless in a cross-compiling context like BR
>
> Before this patch, test time dependencies are handled like runtime dependencies.
>
> After this patch, test time dependencies are ignored by default.
> The new option -test allows to add them anyway.
> """

Looks, much, much better. I understand now.

Thanks for the better commit message!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/3] perl: bump to version 5.20.1

Thomas Petazzoni-2
In reply to this post by Francois Perrad
Dear Francois Perrad,

On Wed,  1 Oct 2014 20:36:57 +0200, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <[hidden email]>
> ---
>  package/perl/perl-uClibc-IPv6.patch | 10 +++++-----
>  package/perl/perl.mk                | 11 +++++++----
>  support/scripts/scancpan            |  2 +-
>  3 files changed, 13 insertions(+), 10 deletions(-)

Don't know if it's related to the version bump, but perl now fails to
build on PowerPC:

  http://autobuild.buildroot.org/results/8ad/8ade6c432ffa725a324f9e7cfb18f6453687b129/build-end.log

Could you have a look?

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 3/3] support/script/scancpan: add option test

Thomas Petazzoni-2
In reply to this post by Francois Perrad
Dear Francois Perrad,

On Wed,  1 Oct 2014 20:36:59 +0200, Francois Perrad wrote:
> test modules are usually useless on BR
>
> Signed-off-by: Francois Perrad <[hidden email]>
> ---
>  support/scripts/scancpan | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)

Thanks, applied, after adding your new commit message.

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/3] perl: bump to version 5.20.1

François PERRAD
In reply to this post by Thomas Petazzoni-2
2014-10-04 14:26 GMT+02:00 Thomas Petazzoni
<[hidden email]>:

> Dear Francois Perrad,
>
> On Wed,  1 Oct 2014 20:36:57 +0200, Francois Perrad wrote:
>> Signed-off-by: Francois Perrad <[hidden email]>
>> ---
>>  package/perl/perl-uClibc-IPv6.patch | 10 +++++-----
>>  package/perl/perl.mk                | 11 +++++++----
>>  support/scripts/scancpan            |  2 +-
>>  3 files changed, 13 insertions(+), 10 deletions(-)
>
> Don't know if it's related to the version bump, but perl now fails to
> build on PowerPC:
>
>   http://autobuild.buildroot.org/results/8ad/8ade6c432ffa725a324f9e7cfb18f6453687b129/build-end.log
>
> Could you have a look?
>

I've already filled an issue, see https://github.com/arsv/perl-cross/issues/10

François

> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> [hidden email]
> http://lists.busybox.net/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/3] perl: bump to version 5.20.1

Thomas Petazzoni-2
Dear François Perrad,

On Sat, 4 Oct 2014 14:52:10 +0200, François Perrad wrote:

> > Don't know if it's related to the version bump, but perl now fails to
> > build on PowerPC:
> >
> >   http://autobuild.buildroot.org/results/8ad/8ade6c432ffa725a324f9e7cfb18f6453687b129/build-end.log
> >
> > Could you have a look?
> >
>
> I've already filled an issue, see https://github.com/arsv/perl-cross/issues/10

Ok, thanks. Do you think the perl-cross people will be reactive? If
not, what do we do in the mean time: revert the bump? Disable perl on
big-endian architectures?

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot