a package infrastructure for Perl/CPAN modules
v5 cover a package infrastructure for Perl/CPAN modules
delta V4 vs V5 :
- better commit log
- remove HOST_INTLTOOL_CONF_OPT
- remove host-qemu patch
Francois Perrad (8):
host-perl: refactor and rename PERL5LIB
pkg-perl: new infrastructure
scancpan: a new script
host-perl-xml-parser: rename and refactor with perl infrastructure
host-perl-module-build: new package
perl: remove useless patch
manual: adding packages perl
cpanminus: remove it
Config.in | 10 + docs/manual/adding-packages-perl.txt | 110 ++++ docs/manual/adding-packages.txt | 2 + package/Config.in | 2 - package/Makefile.in | 13 +- package/cpanminus/Config.in | 40 -- package/cpanminus/cpanminus.mk | 47 -- package/intltool/intltool.mk | 4 +- package/libxml-parser-perl/Config.in | 10 - package/libxml-parser-perl/libxml-parser-perl.mk | 35 -- package/metacity/metacity.mk | 2 +- package/perl-module-build/perl-module-build.mk | 12 + package/perl-xml-parser/perl-xml-parser.mk | 17 + package/perl/perl-fix-Module-Build.patch | 16 - package/pkg-perl.mk | 198 ++++++ support/scripts/scancpan | 694 ++++++++++++++++++++++ 16 files changed, 1054 insertions(+), 158 deletions(-) create mode 100644 docs/manual/adding-packages-perl.txt delete mode 100644 package/cpanminus/Config.in delete mode 100644 package/cpanminus/cpanminus.mk delete mode 100644 package/libxml-parser-perl/Config.in delete mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk create mode 100644 package/perl-module-build/perl-module-build.mk create mode 100644 package/perl-xml-parser/perl-xml-parser.mk delete mode 100644 package/perl/perl-fix-Module-Build.patch create mode 100644 package/pkg-perl.mk create mode 100755 support/scripts/scancpan
Signature · 1 line
1.7.9.5
PATCH v5 1/8 host-perl: refactor and rename PERL5LIB
The official Perl documentation refers only to PERL5LIB. PERLLIB is obsolete, we don't need to be compatible with Perl4.
HOST_INTLTOOL_CONF_OPT is useless because HOST_CONFIGURE_OPTS already contains PERL5LIB.
--- package/Makefile.in | 11 +++++++---- package/intltool/intltool.mk | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-)
package/Makefile.in +7 -4
@@ -206,6 +206,8 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \ sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p') +HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl + TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ AR="$(TARGET_AR)" \ AS="$(TARGET_AS)" \
@@ -241,11 +243,12 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ LDFLAGS="$(TARGET_LDFLAGS)" \ FCFLAGS="$(TARGET_FCFLAGS)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" \ + PERL5LIB=$(HOST_PERL5LIB) \ STAGING_DIR="$(STAGING_DIR)" TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" + PERL5LIB=$(HOST_PERL5LIB) + HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ AR="$(HOSTAR)" \
@@ -267,7 +270,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" \ + PERL5LIB=$(HOST_PERL5LIB) \ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" HOST_MAKE_ENV=PATH=$(HOST_PATH) \
@@ -275,7 +278,7 @@ HOST_MAKE_ENV=PATH=$(HOST_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" + PERL5LIB=$(HOST_PERL5LIB) # This extra environment we can not export ourselves (eg. because some # packages use that variable internally, eg. uboot), so we have to
package/intltool/intltool.mk +0 -2
@@ -10,8 +10,6 @@ INTLTOOL_LICENSE = GPLv2+ INTLTOOL_LICENSE_FILES = COPYING HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl -HOST_INTLTOOL_CONF_OPT = \ - PERLLIB=$(HOST_DIR)/usr/lib/perl $(eval $(autotools-package)) $(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
PATCH v5 1/8 host-perl: refactor and rename PERL5LIB
Quoted 6 lines · Francois Perrad
The official Perl documentation refers only to PERL5LIB. PERLLIB is obsolete, we don't need to be compatible with Perl4.
HOST_INTLTOOL_CONF_OPTis useless becauseHOST_CONFIGURE_OPTSalready contains PERL5LIB.Signed-off-by Francois Perrad <[email protected]>
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v5 1/8 host-perl: refactor and rename PERL5LIB
In reply to Francois PerradQuoted 16 lines · Francois Perrad
The official Perl documentation refers only to PERL5LIB. PERLLIB is obsolete, we don't need to be compatible with Perl4.
HOST_INTLTOOL_CONF_OPTis useless becauseHOST_CONFIGURE_OPTSalready contains PERL5LIB.Signed-off-by Francois Perrad <[email protected]>--- package/Makefile.in | 11 +++++++---- package/intltool/intltool.mk | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-)package/Makefile.in +0
-0
package/Makefile.in HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) · line 209
Quoted 4 lines
package/Makefile.in +1
-0@@ -206,6 +206,8 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \ sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p') +HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl
Side-track: since this is used in all environments, why don't we just
export it?
Regards,
Arnout
Quoted 51 lines
package/Makefile.in +6
-4+ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ AR="$(TARGET_AR)" \ AS="$(TARGET_AS)" \@@ -241,11 +243,12 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ LDFLAGS="$(TARGET_LDFLAGS)" \ FCFLAGS="$(TARGET_FCFLAGS)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" \ + PERL5LIB=$(HOST_PERL5LIB) \ STAGING_DIR="$(STAGING_DIR)" TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" + PERL5LIB=$(HOST_PERL5LIB) + HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ AR="$(HOSTAR)" \@@ -267,7 +270,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" \ + PERL5LIB=$(HOST_PERL5LIB) \ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" HOST_MAKE_ENV=PATH=$(HOST_PATH) \@@ -275,7 +278,7 @@ HOST_MAKE_ENV=PATH=$(HOST_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \ - PERLLIB="$(HOST_DIR)/usr/lib/perl" + PERL5LIB=$(HOST_PERL5LIB) # This extra environment we can not export ourselves (eg. because some # packages use that variable internally, eg. uboot), so we have topackage/intltool/intltool.mk +0
-2@@ -10,8 +10,6 @@ INTLTOOL_LICENSE = GPLv2+ INTLTOOL_LICENSE_FILES = COPYING HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl -HOST_INTLTOOL_CONF_OPT = \ - PERLLIB=$(HOST_DIR)/usr/lib/perl $(eval $(autotools-package)) $(eval $(host-autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v5 2/8 pkg-perl: new infrastructure
In reply to Francois Perrad--- Config.in | 10 +++ package/Makefile.in | 4 +- package/pkg-perl.mk | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 package/pkg-perl.mk
Config.in +10 -0
@@ -225,6 +225,16 @@ config BR2_LUAROCKS_MIRROR See http://luarocks.org +config BR2_CPAN_MIRROR + string "CPAN mirror" + default "http://search.cpan.org/CPAN" + help + CPAN has multiple software mirrors scattered around the world. + This option allows you to select a mirror. + + The list of mirrors is available at: + http://search.cpan.org/mirror + endmenu config BR2_JLEVEL
package/Makefile.in +3 -1
@@ -206,7 +206,8 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \ sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p') -HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl +HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}") +HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5 TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ AR="$(TARGET_AR)" \
@@ -376,4 +377,5 @@ include package/pkg-autotools.mk include package/pkg-cmake.mk include package/pkg-luarocks.mk include package/pkg-python.mk +include package/pkg-perl.mk include package/pkg-generic.mk
package/pkg-perl.mk new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v5 2/8 pkg-perl: new infrastructure
Hi Francois,
Quoted 17 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- Config.in | 10 +++ package/Makefile.in | 4 +- package/pkg-perl.mk | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 package/pkg-perl.mkConfig.in +0
-0@@ -225,6 +225,16 @@ config BR2_LUAROCKS_MIRROR See http://luarocks.org
Config.in config BR2_LUAROCKS_MIRROR · line 237
Quoted 10 lines
Config.in +10
-0+config BR2_CPAN_MIRROR + string "CPAN mirror" + default "http://search.cpan.org/CPAN" + help + CPAN has multiple software mirrors scattered around the world. + This option allows you to select a mirror. + + The list of mirrors is available at: + http://search.cpan.org/mirror +
For users not familiar with Perl, this option in a general buildroot menu is confusing: "What the heck is CPAN?".
I would suggest to add a reference to Perl here, for example in the
title: "CPAN mirror (perl packages)"
and in the help text: "CPAN (Comprehensive Perl Archive Network) is a repository of perl packages. It has multiple ... "
Quoted 63 lines
Config.in +0
-0endmenu config BR2_JLEVELpackage/Makefile.in +3
-1@@ -206,7 +206,8 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \ sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p') -HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl +HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}") +HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5 TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ AR="$(TARGET_AR)" \@@ -376,4 +377,5 @@ include package/pkg-autotools.mk include package/pkg-cmake.mk include package/pkg-luarocks.mk include package/pkg-python.mk +include package/pkg-perl.mk include package/pkg-generic.mkpackage/pkg-perl.mk new file +34
-0@@ -0,0 +1,198 @@ +################################################################################ +# Perl package infrastructure +# +# This file implements an infrastructure that eases development of +# package .mk files for Perl packages. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this perl infrastructure requires +# the .mk file to only specify metadata information about the +# package: name, version, download URL, etc. +# +# We still allow the package .mk file to override what the different +# steps are doing, if needed. For example, if <PKG>_BUILD_CMDS is +# already defined, it is used as the list of commands to perform to +# build the package, instead of the default perl behaviour. The +# package can also define some post operation hooks. +# +################################################################################ + +PKG_PERL_ARCHNAME = $(ARCH)-linux + +################################################################################ +# inner-perl-package -- defines how the configuration, compilation and +# installation of a perl package should be done, implements a +# few hooks to tune the build process for perl specifities and +# calls the generic package infrastructure to generate the necessary +# make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including an HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix
package/pkg-perl.mk line 44
Quoted 10 lines
package/pkg-perl.mk new file +10
-0+# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-perl-package + +$(2)_CONF_OPT ?= +$(2)_BUILD_OPT ?= +$(2)_INSTALL_OPT ?= +$(2)_INSTALL_TARGET_OPT ?=
The indentation here is a bit odd. In fact it's not needed to align here, so I'd suggest to remove the extraneous spaces...
[..]
Best regards,
Thomas
PATCH v5 2/8 pkg-perl: new infrastructure
In reply to Francois PerradQuoted 45 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- Config.in | 10 +++ package/Makefile.in | 4 +- package/pkg-perl.mk | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 package/pkg-perl.mkConfig.in +10
-0@@ -225,6 +225,16 @@ config BR2_LUAROCKS_MIRROR See http://luarocks.org +config BR2_CPAN_MIRROR + string "CPAN mirror" + default "http://search.cpan.org/CPAN" + help + CPAN has multiple software mirrors scattered around the world. + This option allows you to select a mirror. + + The list of mirrors is available at: + http://search.cpan.org/mirror + endmenu config BR2_JLEVELpackage/Makefile.in +2
-1@@ -206,7 +206,8 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \ sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p') -HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl +HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}") +HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5 TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ AR="$(TARGET_AR)" \
package/Makefile.in include package/pkg-autotools.mk · line 380
Quoted 4 lines
package/Makefile.in +1
-0@@ -376,4 +377,5 @@ include package/pkg-autotools.mk include package/pkg-cmake.mk include package/pkg-luarocks.mk include package/pkg-python.mk +include package/pkg-perl.mk
perl comes before python.
Quoted 19 lines
package/Makefile.in +0
-0include package/pkg-generic.mkpackage/pkg-perl.mk new file +12
-0@@ -0,0 +1,198 @@ +################################################################################ +# Perl package infrastructure +# +# This file implements an infrastructure that eases development of +# package .mk files for Perl packages. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this perl infrastructure requires +# the .mk file to only specify metadata information about the +# package: name, version, download URL, etc.
package/pkg-perl.mk line 22
Quoted 10 lines
package/pkg-perl.mk new file +10
-0+# +# We still allow the package .mk file to override what the different +# steps are doing, if needed. For example, if <PKG>_BUILD_CMDS is +# already defined, it is used as the list of commands to perform to +# build the package, instead of the default perl behaviour. The +# package can also define some post operation hooks. +# +################################################################################ + +PKG_PERL_ARCHNAME = $(ARCH)-linux
This one should just be PERL_ARCHNAME.
However, I don't think it's very relevant to define this variable. Just
use $(ARCH)-linux directly.
Quoted 12 lines
package/pkg-perl.mk new file +12
-0+ +################################################################################ +# inner-perl-package -- defines how the configuration, compilation and +# installation of a perl package should be done, implements a +# few hooks to tune the build process for perl specifities and +# calls the generic package infrastructure to generate the necessary +# make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including an HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix
package/pkg-perl.mk line 44
Quoted 10 lines
package/pkg-perl.mk new file +10
-0+# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-perl-package + +$(2)_CONF_OPT ?= +$(2)_BUILD_OPT ?= +$(2)_INSTALL_OPT ?= +$(2)_INSTALL_TARGET_OPT ?=
As I wrote in my last review: you can just remove these, they're useless.
Regards,
Arnout
[snip]
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v5 3/8 scancpan: a new script
In reply to Francois Perradwhich creates Perl/CPAN package files
--- support/scripts/scancpan | 694 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 694 insertions(+) create mode 100755 support/scripts/scancpan
support/scripts/scancpan new file +694 -0
@@ -0,0 +1,694 @@ +#!/usr/bin/env perl + +# This chunk of stuff was generated by App::FatPacker. To find the original +# file's code, look for the end of this BEGIN block or the string 'FATPACK' +BEGIN { +my %fatpacked; + +$fatpacked{"MetaCPAN/API/Tiny.pm"} = <<'METACPAN_API_TINY'; + package MetaCPAN::API::Tiny; + { + $MetaCPAN::API::Tiny::VERSION = '1.131730'; + } + use strict; + use warnings; + # ABSTRACT: A Tiny API client for MetaCPAN + + use Carp; + use JSON::PP 'encode_json', 'decode_json'; + use HTTP::Tiny; + + + sub new { + my ($class, @args) = @_; + + $#_ % 2 == 0 + or croak 'Arguments must be provided as name/value pairs'; + + my %params = @args; + + die 'ua_args must be an array reference' + if $params{ua_args} && ref($params{ua_args}) ne 'ARRAY'; + + my $self = +{ + base_url => $params{base_url} || 'http://api.metacpan.org/v0', + ua => $params{ua} || HTTP::Tiny->new( + $params{ua_args} + ? @{$params{ua_args}} + : (agent => 'MetaCPAN::API::Tiny/' + . ($MetaCPAN::API::VERSION || 'xx'))), + }; + + return bless($self, $class); + } + + sub _build_extra_params { + my $self = shift; + + @_ % 2 == 0 + or croak 'Incorrect number of params, must be key/value'; + + my %extra = @_; + my $ua = $self->{ua}; + + foreach my $key (keys %extra) + { + # The implementation in HTTP::Tiny uses + instead of %20, fix that + $extra{$key} = $ua->_uri_escape($extra{$key}); + $extra{$key} =~ s/\+/%20/g; + } + + my $params = join '&', map { "$_=" . $extra{$_} } sort keys %extra; + + return $params; + } + + + # /source/{author}/{release}/{path} + sub source { + my $self = shift; + my %opts = @_ ? @_ : (); + my $url = ''; + my $error = "Provide 'author' and 'release' and 'path'"; + + %opts or croak $error; + + if ( + defined ( my $author = $opts{'author'} ) && + defined ( my $release = $opts{'release'} ) && + defined ( my $path = $opts{'path'} ) + ) { + $url = "source/$author/$release/$path"; + } else { + croak $error; + } + + $url = $self->{base_url} . "/$url"; + + my $result = $self->{ua}->get($url); + $result->{'success'} + or croak "Failed to fetch '$url': " . $result->{'reason'}; + + return $result->{'content'}; + } + + + # /release/{distribution} + # /release/{author}/{release} + sub release { + my $self = shift; + my %opts = @_ ? @_ : (); + my $url = ''; + my $error = "Either provide 'distribution', or 'author' and 'release', " . + "or 'search'"; + + %opts or croak $error; + + my %extra_opts = (); + + if ( defined ( my $dist = $opts{'distribution'} ) ) { + $url = "release/$dist"; + } elsif ( + defined ( my $author = $opts{'author'} ) && + defined ( my $release = $opts{'release'} ) + ) { + $url = "release/$author/$release"; + } elsif ( defined ( my $search_opts = $opts{'search'} ) ) { + ref $search_opts && ref $search_opts eq 'HASH' + or croak $error; + + %extra_opts = %{$search_opts}; + $url = 'release/_search'; + } else { + croak $error; + } + + return $self->fetch( $url, %extra_opts ); + } + + + # /pod/{module} + # /pod/{author}/{release}/{path} + sub pod { + my $self = shift; + my %opts = @_ ? @_ : (); + my $url = ''; + my $error = "Either provide 'module' or 'author and 'release' and 'path'"; + + %opts or croak $error; + + if ( defined ( my $module = $opts{'module'} ) ) { + $url = "pod/$module"; + } elsif ( + defined ( my $author = $opts{'author'} ) && + defined ( my $release = $opts{'release'} ) && + defined ( my $path = $opts{'path'} ) + ) { + $url = "pod/$author/$release/$path"; + } else { + croak $error; + } + + # check content-type + my %extra = (); + if ( defined ( my $type = $opts{'content-type'} ) ) { + $type =~ m{^ text/ (?: html|plain|x-pod|x-markdown ) $}x + or croak 'Incorrect content-type provided'; + + $extra{headers}{'content-type'} = $type; + } + + $url = $self->{base_url}. "/$url"; + + my $result = $self->{ua}->get( $url, \%extra ); + $result->{'success'} + or croak "Failed to fetch '$url': " . $result->{'reason'}; + + return $result->{'content'}; + } + + + # /module/{module} + sub module { + my $self = shift; + my $name = shift; + + $name or croak 'Please provide a module name'; + + return $self->fetch("module/$name"); + } + + + # file() is a synonym of module + sub file { goto &module } + + + # /author/{author} + sub author { + my $self = shift; + my ( $pause_id, $url, %extra_opts ); + + if ( @_ == 1 ) { + $url = 'author/' . shift; + } elsif ( @_ == 2 ) { + my %opts = @_; + + if ( defined $opts{'pauseid'} ) { + $url = "author/" . $opts{'pauseid'}; + } elsif ( defined $opts{'search'} ) { + my $search_opts = $opts{'search'}; + + ref $search_opts && ref $search_opts eq 'HASH' + or croak "'search' key must be hashref"; + + %extra_opts = %{$search_opts}; + $url = 'author/_search'; + } else { + croak 'Unknown option given'; + } + } else { + croak 'Please provide an author PAUSEID or a "search"'; + } + + return $self->fetch( $url, %extra_opts ); + } + + + + sub fetch { + my $self = shift; + my $url = shift; + my $extra = $self->_build_extra_params(@_); + my $base = $self->{base_url}; + my $req_url = $extra ? "$base/$url?$extra" : "$base/$url"; + + my $result = $self->{ua}->get($req_url); + return $self->_decode_result( $result, $req_url ); + } + + + sub post { + my $self = shift; + my $url = shift; + my $query = shift; + my $base = $self->{base_url}; + + defined $url + or croak 'First argument of URL must be provided'; + + ref $query and ref $query eq 'HASH' + or croak 'Second argument of query hashref must be provided'; + + my $query_json = encode_json( $query ); + my $result = $self->{ua}->request( + 'POST', + "$base/$url", + { + headers => { 'Content-Type' => 'application/json' }, + content => $query_json, + } + ); + + return $self->_decode_result( $result, $url, $query_json ); + } + + sub _decode_result { + my $self = shift; + my ( $result, $url, $original ) = @_; + my $decoded_result; + + ref $result and ref $result eq 'HASH' + or croak 'First argument must be hashref'; + + defined $url + or croak 'Second argument of a URL must be provided'; + + if ( defined ( my $success = $result->{'success'} ) ) { + my $reason = $result->{'reason'} || ''; + $reason .= ( defined $original ? " (request: $original)" : '' ); + + $success or croak "Failed to fetch '$url': $reason"; + } else { + croak 'Missing success in return value'; + } + + defined ( my $content = $result->{'content'} ) + or croak 'Missing content in return value'; + + eval { $decoded_result = decode_json $content; 1 } + or do { croak "Couldn't decode '$content': $@" }; + + return $decoded_result; + } + + 1; + + __END__ + + =pod + + =head1 NAME + + MetaCPAN::API::Tiny - A Tiny API client for MetaCPAN + + =head1 VERSION + + version 1.131730 + + =head1 DESCRIPTION + + This is the Tiny version of L<MetaCPAN::API>. It implements a compatible API + with a few notable exceptions: + + =over 4 + + =item Attributes are direct hash access + + The attributes defined using Mo(o|u)se are now accessed via the blessed hash + directly. There are no accessors defined to access this elements. + + =item Exception handling + + Instead of using Try::Tiny, raw evals are used. This could potentially cause + issues, so just be aware. + + =item Testing + + Test::Fatal was replaced with an eval implementation of exception(). + Test::TinyMocker usage is retained, but may be absorbed since it is pure perl + + =back + + =head1 CLASS_METHODS + + =head2 new + + new is the constructor for MetaCPAN::API::Tiny. In the non-tiny version of this + module, this is provided via Any::Moose built from the attributes defined. In + the tiny version, we define our own constructor. It takes the same arguments + and provides similar checks to MetaCPAN::API with regards to arguments passed. + + =head1 PUBLIC_METHODS + + =head2 source + + my $source = $mcpan->source( + author => 'DOY', + release => 'Moose-2.0201', + path => 'lib/Moose.pm', + ); + + Searches MetaCPAN for a module or a specific release and returns the plain source. + + =head2 release + + my $result = $mcpan->release( distribution => 'Moose' ); + + # or + my $result = $mcpan->release( author => 'DOY', release => 'Moose-2.0001' ); + + Searches MetaCPAN for a dist. + + You can do complex searches using 'search' parameter: + + # example lifted from MetaCPAN docs + my $result = $mcpan->release( + search => { + author => "OALDERS AND ", + filter => "status:latest", + fields => "name", + size => 1, + }, + ); + + =head2 pod + + my $result = $mcpan->pod( module => 'Moose' ); + + # or + my $result = $mcpan->pod( + author => 'DOY', + release => 'Moose-2.0201', + path => 'lib/Moose.pm', + ); + + Searches MetaCPAN for a module or a specific release and returns the POD. + + =head2 module + + my $result = $mcpan->module('MetaCPAN::API'); + + Searches MetaCPAN and returns a module's ".pm" file. + + =head2 file + + A synonym of L</module> + + =head2 author + + my $result1 = $mcpan->author('XSAWYERX'); + my $result2 = $mcpan->author( pauseid => 'XSAWYERX' ); + + Searches MetaCPAN for a specific author. + + You can do complex searches using 'search' parameter: + + # example lifted from MetaCPAN docs + my $result = $mcpan->author( + search => { + q => 'profile.name:twitter', + size => 1, + }, + ); + + =head2 fetch + + my $result = $mcpan->fetch('/release/distribution/Moose'); + + # with parameters + my $more = $mcpan->fetch( + '/release/distribution/Moose', + param => 'value', + ); + + This is a helper method for API implementations. It fetches a path from MetaCPAN, decodes the JSON from the content variable and returns it. + + You don't really need to use it, but you can in case you want to write your own extension implementation to MetaCPAN::API. + + It accepts an additional hash as "GET" parameters. + + =head2 post + + # /release&content={"query":{"match_all":{}},"filter":{"prefix":{"archive":"Cache-Cache-1.06"}}} + my $result = $mcpan->post( + 'release', + { + query => { match_all => {} }, + filter => { prefix => { archive => 'Cache-Cache-1.06' } }, + }, + ); + + The POST equivalent of the "fetch()" method. It gets the path and JSON request. + + =head1 THANKS + + Overall the tests and code were ripped directly from MetaCPAN::API and + tiny-fied. A big thanks to Sawyer X for writing the original module. + + =head1 AUTHOR + + Nicholas R. Perez <[email protected]> + + =head1 COPYRIGHT AND LICENSE + + This software is copyright (c) 2013 by Nicholas R. Perez <[email protected]>. + + This is free software; you can redistribute it and/or modify it under + the same terms as the Perl 5 programming language system itself. + + =cut +METACPAN_API_TINY + +s/^ //mg for values %fatpacked; + +unshift @INC, sub { + if (my $fat = $fatpacked{$_[1]}) { + if ($] < 5.008) { + return sub { + return 0 unless length $fat; + $fat =~ s/^([^\n]*\n?)//; + $_ = $1; + return 1; + }; + } + open my $fh, '<', \$fat + or die "FatPacker error loading $_[1] (could be a perl installation issue?)"; + return $fh; + } + return +}; + +} # END OF FATPACK CODE + + +use 5.010; +use strict; +use warnings; +use Fatal qw(open close); + +use Getopt::Long; +use Pod::Usage; +use File::Basename; +use Module::CoreList; +use MetaCPAN::API::Tiny; + +my ($help, $man, $quiet, $force, $recommend); +GetOptions( 'help|?' => \$help, + 'man' => \$man, + 'quiet|q' => \$quiet, + 'force|f' => \$force, + 'recommend' => \$recommend +) or pod2usage(-exitval => 1); +pod2usage(-exitval => 0) if $help; +pod2usage(-exitval => 0, -verbose => 2) if $man; +pod2usage(-exitval => 1) if scalar @ARGV == 0; + +my %dist; +my %deps_build; +my %deps_runtime; +my $mcpan = MetaCPAN::API::Tiny->new(); + +sub fetch { + my $name = shift; + unless ($dist{$name}) { + say qq{fetch ${name}} unless $quiet; + my $result = $mcpan->release( distribution => $name ); + $dist{$name} = $result; + my @deps_build = (); + my @deps_runtime = (); + my $mb; + foreach my $dep (@{$result->{dependency}}) { + my $modname = ${$dep}{module}; + $mb = 1 if $modname eq q{Module::Build}; + next if $modname eq q{perl}; + next if $modname =~ m|^Alien|; + next if $modname =~ m|^Win32|; + next if Module::CoreList::first_release( $modname ); + next if ${$dep}{phase} eq q{develop}; + next if ${$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}) { + push @deps_runtime, $distname; + } + else { # configure, build + push @deps_build, $distname; + } + fetch( $distname ); + } + unshift @deps_build, q{Module-Build} if $mb; + $deps_build{$name} = \@deps_build; + $deps_runtime{$name} = \@deps_runtime; + } + return; +} + +foreach my $distname (@ARGV) { + fetch( $distname ); +} +say scalar keys %dist, q{ packages fetched.} unless $quiet; + +sub fsname { + my $name = shift; + return q{perl-} . lc $name; +} + +sub brname { + my $name = shift; + $name =~ s|-|_|g; + return uc $name; +} + +while (my ($distname, $dist) = each %dist) { + my $fsname = fsname( $distname ); + my $dirname = q{package/} . $fsname; + my $cfgname = $dirname . q{/Config.in}; + my $mkname = $dirname . q{/} . $fsname . q{.mk}; + my $brname = brname( $fsname ); + mkdir $dirname unless -d $dirname; + if ($force || !-f $cfgname) { + my $abstract = $dist->{abstract} || q{NO ABSTRACT}; + say qq{write ${cfgname}} unless $quiet; + open my $fh, q{>}, $cfgname; + say {$fh} qq{config BR2_PACKAGE_${brname}}; + say {$fh} qq{\tbool "${fsname}"}; + foreach my $dep (@{$deps_runtime{$distname}}) { + my $brdep = brname( fsname( $dep ) ); + say {$fh} qq{\tselect BR2_PACKAGE_${brdep}}; + } + say {$fh} qq{\thelp}; + say {$fh} qq{\t ${abstract}}; + say {$fh} qq{}; + close $fh; + } + if ($force || !-f $mkname) { + my $version = $dist->{version}; + my $site = dirname( $dist->{download_url} ); + my($scheme, $auth, $path) = $dist->{download_url} =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)|; + my($filename, $directories, $suffix) = fileparse( $path, q{tar.gz}, q{tgz} ); + my $dependencies = join q{ }, map( { q{host-} . fsname( $_ ); } @{$deps_build{$distname}} ), + map( { fsname( $_ ); } @{$deps_runtime{$distname}} ); + my $host_dependencies = join q{ }, map { q{host-} . fsname( $_ ); } @{$deps_build{$distname}}, + @{$deps_runtime{$distname}}; + my $license = ref $dist->{license} eq 'ARRAY' + ? join q{ }, @{$dist->{license}} + : $dist->{license}; + say qq{write ${mkname}} unless $quiet; + open my $fh, q{>}, $mkname; + say {$fh} qq{################################################################################}; + say {$fh} qq{#}; + say {$fh} qq{# ${fsname}}; + say {$fh} qq{#}; + say {$fh} qq{################################################################################}; + say {$fh} qq{}; + say {$fh} qq{${brname}_VERSION = ${version}}; + say {$fh} qq{${brname}_SOURCE = ${distname}-\$(${brname}_VERSION).${suffix}}; + say {$fh} qq{${brname}_SITE = \$(BR2_CPAN_MIRROR)${directories}}; + say {$fh} qq{${brname}_DEPENDENCIES = perl ${dependencies}}; + say {$fh} qq{#HOST_${brname}_DEPENDENCIES = ${host_dependencies}}; + say {$fh} qq{${brname}_LICENSE = ${license}} if $license && $license ne q{unknown}; + say {$fh} qq{}; + say {$fh} qq{\$(eval \$(perl-package))}; + say {$fh} qq{#\$(eval \$(host-perl-package))}; + close $fh; + } +} + +my %pkg; +my $cfgname = q{package/Config.in}; +if (-f $cfgname) { + open my $fh, q{<}, $cfgname; + while (<$fh>) { + chomp; + $pkg{$_} = 1 if m|package/perl-|; + } + close $fh; +} + +foreach my $distname (sort keys %dist) { + my $fsname = fsname( $distname ); + $pkg{qq{source "package/${fsname}/Config.in"}} = 1; +} + +say qq{${cfgname} must contains the following lines:}; +say join qq{\n}, sort keys %pkg; + +__END__ + +=head1 NAME + +support/scripts/scancpan Try-Tiny Moo + +=head1 SYNOPSIS + +supports/scripts/scancpan [options] [distname ...] + + Options: + -help + -man + -quiet + -force + -recommend + +=head1 OPTIONS + +=over 8 + +=item B<-help> + +Print a brief help message and exits. + +=item B<-man> + +Prints the manual page and exits. + +=item B<-quiet> + +Executes without output + +=item B<-force> + +Forces the overwritting of existing files. + +=item B<-recommend> + +Adds I<recommended> dependencies. + +=back + +=head1 DESCRIPTION + +This script creates the BR package files for all Perl/CPAN +distributions required by all distname. These data are fetched from +https://metacpan.org/. + +See the Buildroot documentation for details on the usage of the Perl +infrastructure. + +=head1 LICENSE + +This script is a part of Buildroot. + +This script requires the module C<MetaCPAN::API::Tiny> (version 1.131730) +which was included at the beginning of this file by the tool C<fatpack>. + +See L<http://search.cpan.org/~nperez/MetaCPAN-API-Tiny-1.131730/>. + +See L<http://search.cpan.org/search?query=App-FatPacker&mode=dist>. + +These both libraries are free software and may be distributed under the same +terms as perl itself. + +And perl may be distributed under the terms of Artistic v1 or GPL v1 license. + +=cut
Signature · 1 line
1.7.9.5
PATCH v5 4/8 host-perl-xml-parser: rename and refactor with perl infrastructure
In reply to Francois PerradEven though libxml-parser-perl had a Config.in file with an option to enable it on the target, this option was hidden by a dependency on BR2_HOST_ONLY. So in practice, it was not possible to enable libxml-parser-perl on the target. This allows us to rename libxml-parser-perl to perl-xml-parser to follow the new naming convention of Perl packages, without having to introduce Config.in.legacy material.
In addition to this rename, the package is converted to use the newly introduced Perl package infrastructure.
--- package/Config.in | 1 - package/intltool/intltool.mk | 2 +- package/libxml-parser-perl/Config.in | 10 ------- package/libxml-parser-perl/libxml-parser-perl.mk | 35 ---------------------- package/metacity/metacity.mk | 2 +- package/perl-xml-parser/perl-xml-parser.mk | 17 +++++++++++ 6 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 package/libxml-parser-perl/Config.in delete mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk create mode 100644 package/perl-xml-parser/perl-xml-parser.mk
package/Config.in +0 -1
@@ -621,7 +621,6 @@ source "package/json-c/Config.in" source "package/json-glib/Config.in" source "package/libjson/Config.in" source "package/libroxml/Config.in" -source "package/libxml-parser-perl/Config.in" source "package/libxml2/Config.in" source "package/libxmlpp/Config.in" source "package/libxslt/Config.in"
package/intltool/intltool.mk +1 -1
@@ -9,7 +9,7 @@ INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+downlo INTLTOOL_LICENSE = GPLv2+ INTLTOOL_LICENSE_FILES = COPYING -HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl +HOST_INTLTOOL_DEPENDENCIES = host-gettext host-perl-xml-parser $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/libxml-parser-perl/Config.in deleted +0 -10
@@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBXML_PARSER_PERL - bool "libxml-parser-perl" - select BR2_PACKAGE_EXPAT - # Hide from configuration as we only support the host package - # for the moment - depends on BR2_HOST_ONLY - help - The Perl XML::Parser module. - - http://www.cpan.org/modules/by-module/XML/
package/libxml-parser-perl/libxml-parser-perl.mk deleted +0 -35
@@ -1,35 +0,0 @@ -################################################################################ -# -# libxml-parser-perl -# -################################################################################ - -LIBXML_PARSER_PERL_VERSION = 2.36 -LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz -LIBXML_PARSER_PERL_SITE = http://www.cpan.org/modules/by-module/XML/ - -LIBXML_PARSER_PERL_DEPENDENCIES = expat - -define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS - (cd $(@D) ; \ - $(HOST_CONFIGURE_OPTS) perl Makefile.PL \ - PREFIX=$(HOST_DIR)/usr \ - EXPATLIBPATH=$(HOST_DIR)/usr/lib \ - EXPATINCPATH=$(HOST_DIR)/usr/include \ - INSTALLDIRS=site \ - INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \ - INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \ - USE_MM_LD_RUN_PATH=1 \ - ) -endef - -define HOST_LIBXML_PARSER_PERL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package))
package/metacity/metacity.mk +1 -1
@@ -19,7 +19,7 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ METACITY_DEPENDENCIES = libgtk2 \ xlib_libX11 \ - host-libxml-parser-perl \ + host-perl-xml-parser \ xlib_libXcomposite \ xlib_libXfixes \ xlib_libXrender \
package/perl-xml-parser/perl-xml-parser.mk new file +17 -0
@@ -0,0 +1,17 @@ +################################################################################ +# +# perl-xml-parser +# +################################################################################ + +PERL_XML_PARSER_VERSION = 2.41 +PERL_XML_PARSER_SOURCE = XML-Parser-$(PERL_XML_PARSER_VERSION).tar.gz +PERL_XML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR/ +PERL_XML_PARSER_DEPENDENCIES = expat +PERL_XML_PARSER_LICENSE = perl_5 + +HOST_LIBXML_PARSER_PERL_CONF_OPT = \ + EXPATLIBPATH=$(HOST_DIR)/usr/lib \ + EXPATINCPATH=$(HOST_DIR)/usr/include + +$(eval $(host-perl-package))
Signature · 1 line
1.7.9.5
PATCH v5 4/8 host-perl-xml-parser: rename and refactor with perl infrastructure
Quoted 8 lines · Francois Perrad
Even though libxml-parser-perl had a Config.in file with an option to enable it on the target, this option was hidden by a dependency on
BR2_HOST_ONLY. So in practice, it was not possible to enable libxml-parser-perl on the target. This allows us to rename libxml-parser-perl to perl-xml-parser to follow the new naming convention of Perl packages, without having to introduce Config.in.legacy material.
Quoted 4 lines
In addition to this rename, the package is converted to use the newly introduced Perl package infrastructure.
Signed-off-by Francois Perrad <[email protected]>
PATCH v5 5/8 host-perl-module-build: new package
In reply to Francois Perradthe version coming with host-perl is too old
--- package/perl-module-build/perl-module-build.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 package/perl-module-build/perl-module-build.mk
package/perl-module-build/perl-module-build.mk new file +12 -0
@@ -0,0 +1,12 @@ +################################################################################ +# +# perl-module-build +# +################################################################################ + +PERL_MODULE_BUILD_VERSION = 0.4204 +PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz +PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT/ +PERL_MODULE_BUILD_LICENSE = perl_5 + +$(eval $(host-perl-package))
Signature · 1 line
1.7.9.5
PATCH v5 5/8 host-perl-module-build: new package
Quoted 16 lines · Francois Perrad
the version coming with host-perl is too old
Signed-off-by Francois Perrad <[email protected]>--- package/perl-module-build/perl-module-build.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 package/perl-module-build/perl-module-build.mkpackage/perl-module-build/perl-module-build.mk new file +2
-0@@ -0,0 +1,12 @@ +################################################################################ +#
package/perl-module-build/perl-module-build.mk line 12
Quoted 10 lines
package/perl-module-build/perl-module-build.mk new file +10
-0+# perl-module-build +# +################################################################################ + +PERL_MODULE_BUILD_VERSION = 0.4204 +PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz +PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT/ +PERL_MODULE_BUILD_LICENSE = perl_5 + +$(eval $(host-perl-package))
PATCH v5 6/8 perl: remove useless patch
In reply to Francois PerradThe Perl infrastructure uses a host version of Module-Build (see previous commit "host-perl-module-build: new package"). The target version is never used, so no need to patch it.
--- package/perl/perl-fix-Module-Build.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 package/perl/perl-fix-Module-Build.patch
package/perl/perl-fix-Module-Build.patch deleted +0 -16
@@ -1,16 +0,0 @@ - -Signed-off-by: Francois Perrad <[email protected]> - -Index: b/cpan/Module-Build/lib/Module/Build/Base.pm -=================================================================== ---- a/cpan/Module-Build/lib/Module/Build/Base.pm -+++ b/cpan/Module-Build/lib/Module/Build/Base.pm -@@ -460,7 +460,7 @@ - my $proto = shift; - my $c = ref($proto) ? $proto->{config} : 'Module::Build::Config'; - -- my $perl = $^X; -+ my $perl = $ENV{RUN_PERL} || $^X; - my $perl_basename = File::Basename::basename($perl); - - my @potential_perls;
Signature · 1 line
1.7.9.5
PATCH v5 7/8 manual: adding packages perl
In reply to Francois Perrad--- docs/manual/adding-packages-perl.txt | 110 ++++++++++++++++++++++++++++++++++ docs/manual/adding-packages.txt | 2 + 2 files changed, 112 insertions(+) create mode 100644 docs/manual/adding-packages-perl.txt
docs/manual/adding-packages-perl.txt new file +110 -0
@@ -0,0 +1,110 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +Infrastructure for Perl/CPAN packages +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[[perl-package-tutorial]] + ++perl-package+ tutorial +^^^^^^^^^^^^^^^^^^^^^^^ + +First, let's see how to write a +.mk+ file for a Perl/CPAN package, +with an example : + +------------------------ +01: ################################################################################ +02: # +03: # perl-foo-bar +04: # +05: ################################################################################ +06: +07: PERL_FOO_BAR_VERSION = 0.02 +08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz +09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER/ +10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures +11: PERL_FOO_BAR_LICENSE = perl_5 +12: PERL_FOO_BAR_LICENSE_FILES = LICENSE +13: +14: $(eval $(perl-package)) +------------------------ + +On line 7, we declare the version of the package. + +On line 8 and 9, we declare the name of the tarball and the location +of the tarball on a CPAN server. Buildroot will automatically download +the tarball from this location. + +On line 10, we declare our dependencies, so that they are built +before the build process of our package starts. + +On line 11 and 12, we give licensing details about the package (its +license on line 11, and the file containing the license text on line +12). + +Finally, on line 14, we invoke the +perl-package+ macro that +generates all the Makefile rules that actually allow the package to be +built. + +Most of these data could be retrieved from https://metacpan.org/. +So, this file and the Config.in could be generated by running +the script +supports/scripts/scancpan Foo-Bar+ in the +TOPDIR+ directory +(or in the +BR2_EXTERNAL+ directory). +This script recursively creates packages for all required Perl/CPAN +dependencies. + +[[perl-package-reference]] + ++perl-package+ reference +^^^^^^^^^^^^^^^^^^^^^^^^ + +As a policy, packages that provide Perl/CPAN modules should all be +named +perl-<something>+ in Buildroot. + +This infrastructure handles various Perl build systems : ++ExtUtils-MakeMaker+, +Module-Build+ and +Module-Build-Tiny+. ++Build.PL+ is always prefered when a package provides a +Makefile.PL+ +and a +Build.PL+. + +The main macro of the Perl/CPAN package infrastructure is ++perl-package+. It is similar to the +generic-package+ macro. The ability to +have target and host packages is also available, with the ++host-perl-package+ macro. + +Just like the generic infrastructure, the Perl/CPAN infrastructure +works by defining a number of variables before calling the ++perl-package+ macro. + +First, all the package metadata information variables that exist in the +generic infrastructure also exist in the Perl/CPAN infrastructure: ++PERL_FOO_VERSION+, +PERL_FOO_SOURCE+, ++PERL_FOO_PATCH+, +PERL_FOO_SITE+, ++PERL_FOO_SUBDIR+, +PERL_FOO_DEPENDENCIES+, ++PERL_FOO_INSTALL_TARGET+. + +Note that: + + * Setting +PERL_FOO_INSTALL_STAGING+ to +YES+ has no effect (unless + a +PERL_FOO_INSTALL_STAGING_CMDS+ variable is defined), since + Perl modules generally don't need to be installed to the + +staging+ directory. + +A few additional variables, specific to the Perl/CPAN infrastructure, +can also be defined. Many of them are only useful in very specific +cases, typical packages will therefore only use a few of them. + +* +PERL_FOO_CONF_OPT+, to specify additional configure + options to pass to the +perl Makefile.PL+ or +perl Build.PL+. + By default, empty. + +* +PERL_FOO_BUILD_OPT+, to specify additional options to + pass to +make pure_all+ or +perl Build build+ in the build step. + By default, empty. + +* +PERL_FOO_INSTALL_TARGET_OPT+, to specify additional options to + pass to +make pure_install+ or +perl Build install+ in the install step. + By default, empty. + +* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to + pass to +make pure_install+ or +perl Build install+ in the install step. + By default, empty.
docs/manual/adding-packages.txt +2 -0
@@ -22,6 +22,8 @@ include::adding-packages-python.txt[] include::adding-packages-luarocks.txt[] +include::adding-packages-perl.txt[] + include::adding-packages-hooks.txt[] include::adding-packages-gettext.txt[]
Signature · 1 line
1.7.9.5
PATCH v5 7/8 manual: adding packages perl
Hi Francois,
Quoted 31 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- docs/manual/adding-packages-perl.txt | 110 ++++++++++++++++++++++++++++++++++ docs/manual/adding-packages.txt | 2 + 2 files changed, 112 insertions(+) create mode 100644 docs/manual/adding-packages-perl.txtdocs/manual/adding-packages-perl.txt new file +17
-0@@ -0,0 +1,110 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +Infrastructure for Perl/CPAN packages +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[[perl-package-tutorial]] + ++perl-package+ tutorial +^^^^^^^^^^^^^^^^^^^^^^^ + +First, let's see how to write a +.mk+ file for a Perl/CPAN package, +with an example : + +------------------------ +01: ################################################################################ +02: #
docs/manual/adding-packages-perl.txt line 27
Quoted 10 lines
docs/manual/adding-packages-perl.txt new file +10
-0+03: # perl-foo-bar +04: # +05: ################################################################################ +06: +07: PERL_FOO_BAR_VERSION = 0.02 +08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz +09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER/ +10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures +11: PERL_FOO_BAR_LICENSE = perl_5 +12: PERL_FOO_BAR_LICENSE_FILES = LICENSE
Is 'perl_5' an actual license? Is it different than the Artistic License? SPDX specifies an 'Artistic-1.0-Perl':
http://spdx.org/licenses/Artistic-1.0-Perl
Is this the same license?
In that case, I would prefer to use that identifier in the manual and all packages using this. Additionally, the list of identifiers in buildroot could be updated with that identifier too.
Other than that:
Thanks,
Thomas
PATCH v5 7/8 manual: adding packages perl
2014-02-07 21:49 GMT+01:00 Thomas De Schampheleire <[email protected]>:
Quoted 49 lines
Hi Francois,
Quoted 31 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- docs/manual/adding-packages-perl.txt | 110 ++++++++++++++++++++++++++++++++++ docs/manual/adding-packages.txt | 2 + 2 files changed, 112 insertions(+) create mode 100644 docs/manual/adding-packages-perl.txtdocs/manual/adding-packages-perl.txt new file +17
-0@@ -0,0 +1,110 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +Infrastructure for Perl/CPAN packages +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[[perl-package-tutorial]] + ++perl-package+ tutorial +^^^^^^^^^^^^^^^^^^^^^^^ + +First, let's see how to write a +.mk+ file for a Perl/CPAN package, +with an example : + +------------------------ +01: ################################################################################ +02: #docs/manual/adding-packages-perl.txt line 27
Quoted 10 lines
docs/manual/adding-packages-perl.txt new file +10
-0+03: # perl-foo-bar +04: # +05: ################################################################################ +06: +07: PERL_FOO_BAR_VERSION = 0.02 +08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz +09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER/ +10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures +11: PERL_FOO_BAR_LICENSE = perl_5 +12: PERL_FOO_BAR_LICENSE_FILES = LICENSEIs '
perl_5' an actual license? Is it different than the Artistic License? SPDX specifies an 'Artistic-1.0-Perl':
http://spdx.org/licenses/Artistic-1.0-Perl
Quoted 5 lines
Is this the same license?
In that case, I would prefer to use that identifier in the manual and all packages using this. Additionally, the list of identifiers in buildroot could be updated with that identifier too.
Here is an example with Compress-Snappy
The CPAN page http://search.cpan.org/~gray/Compress-Snappy-0.23/ contains :
License The Perl 5 License (Artistic 1 & GPL 1)
The result of http://explorer.metacpan.org/?url=/release/Compress-Snappy
contains :
"license" : [
"perl_5"
],The script scancpan retrieves data from metacpan, so 'perl_5'.
The tarball Compress-Snappy contains no license file, but both
http://cpansearch.perl.org/src/GRAY/Compress-Snappy-0.23/README and
http://search.cpan.org/~gray/Compress-Snappy-0.23/lib/Compress/Snappy.pm
contain this statement :
"This library is free software; you can redistribute it and/or
modify it under the same terms as Perl itself."
And Perl has 2 licenses : Artistic (v1) and GPL v1.
This is the Perl way.
Fran?ois
Quoted 9 lines
Other than that:
Reviewed-by Thomas De Schampheleire <[email protected]>Thanks,
Thomas
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v5 8/8 cpanminus: remove it
In reply to Francois Perradcpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
--- package/Config.in | 1 - package/cpanminus/Config.in | 40 ---------------------------------- package/cpanminus/cpanminus.mk | 47 ---------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 package/cpanminus/Config.in delete mode 100644 package/cpanminus/cpanminus.mk
package/Config.in +0 -1
@@ -395,7 +395,6 @@ source "package/nodejs/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL menu "Perl libraries/modules" -source "package/cpanminus/Config.in" endmenu endif source "package/php/Config.in"
package/cpanminus/Config.in deleted +0 -40
@@ -1,40 +0,0 @@ -config BR2_PACKAGE_CPANMINUS - bool "cpanminus" - # Requires host-qemu, which cannot work properly due to kernel - # headers mismatch between the build environment and the - # target. - depends on BR2_BROKEN - help - cpanminus is a script to get, unpack, build and install Perl modules - from CPAN. - - Why? It's dependency free, requires zero configuration, and stands - alone. When running, it requires only 10MB of RAM. - - http://github.com/miyagawa/cpanminus - -if BR2_PACKAGE_CPANMINUS - -config BR2_PACKAGE_CPANMINUS_MIRROR - string "mirror" - help - Specifies the base URL for the CPAN mirror to use, - such as http://cpan.cpantesters.org/. - -config BR2_PACKAGE_CPANMINUS_MODULES - string "Perl modules from CPAN" - default "Curses::UI" - help - List of space-separated Perl modules to install from CPAN. - - Examples: Try::Tiny Dancer YAML Moo - - Install the listed modules and their dependencies. - -config BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES - string "native dependencies" - default "ncurses" - help - Some XS modules require native libraries. - -endif
package/cpanminus/cpanminus.mk deleted +0 -47
47 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v5 8/8 cpanminus: remove it
Hi Fran?ois,
Quoted 11 lines · Francois Perrad
cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 - package/cpanminus/Config.in | 40 ---------------------------------- package/cpanminus/cpanminus.mk | 47 ---------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 package/cpanminus/Config.in delete mode 100644 package/cpanminus/cpanminus.mk
Shouldn't we add an entry in Config.in.legacy for the removed symbol?
Best regards,
Thomas
PATCH v5 8/8 cpanminus: remove it
2014-02-07 21:50 GMT+01:00 Thomas De Schampheleire <[email protected]>:
Quoted 15 lines
Hi Fran?ois,
Quoted 11 lines · Francois Perrad
cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 - package/cpanminus/Config.in | 40 ---------------------------------- package/cpanminus/cpanminus.mk | 47 ---------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 package/cpanminus/Config.in delete mode 100644 package/cpanminus/cpanminus.mk
Quoted 2 lines
Shouldn't we add an entry in Config.in.legacy for the removed symbol?
Perhaps, we could do an exception.
The log of package/cpanminus/Config.in contains only 2 entries :
* cpanminus: mark as broken Thomas Petazzoni 2012-11-16
* cpanminus: new package Francois Perrad 2012-11-03
Fran?ois
Quoted 6 lines
Best regards,
Thomas
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v5 8/8 cpanminus: remove it
Dear Fran?ois Perrad,
Quoted 16 lines · Fran?ois Perrad
2014-02-07 21:50 GMT+01:00 Thomas De Schampheleire <[email protected]>:
Quoted 15 lines
Hi Fran?ois,
Quoted 11 lines · Francois Perrad
cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 - package/cpanminus/Config.in | 40 ---------------------------------- package/cpanminus/cpanminus.mk | 47 ---------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 package/cpanminus/Config.in delete mode 100644 package/cpanminus/cpanminus.mk
Quoted 7 lines
Quoted 2 lines
Shouldn't we add an entry in Config.in.legacy for the removed symbol?
Perhaps, we could do an exception.
The log of package/cpanminus/Config.in contains only 2 entries :
* cpanminus: mark as broken Thomas Petazzoni 2012-11-16
* cpanminus: new package Francois Perrad 2012-11-03
I agree with Fran?ois. cpanminus was marked as broken very quickly after it was introduced, and broken packages cannot be selected in menuconfig. cpanminus has never been selectable in any Buildroot stable release, so there is no need to keep compatibility.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v5 8/8 cpanminus: remove it
Thomas Petazzoni <[email protected]> schreef:
Quoted 27 lines
Dear Fran?ois Perrad,
Quoted 16 lines · Fran?ois Perrad
2014-02-07 21:50 GMT+01:00 Thomas De Schampheleire <[email protected]>:
Quoted 15 lines
Hi Fran?ois,
Quoted 11 lines · Francois Perrad
cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 - package/cpanminus/Config.in | 40 ---------------------------------- package/cpanminus/cpanminus.mk | 47 ---------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 package/cpanminus/Config.in delete mode 100644 package/cpanminus/cpanminus.mkQuoted 7 lines
Quoted 2 lines
Shouldn't we add an entry in Config.in.legacy for the removed symbol?
Perhaps, we could do an exception.
The log of package/cpanminus/Config.in contains only 2 entries :
* cpanminus: mark as broken Thomas Petazzoni 2012-11-16
* cpanminus: new package Francois Perrad 2012-11-03
Quoted 5 lines
I agree with Fran?ois. cpanminus was marked as broken very quickly after it was introduced, and broken packages cannot be selected in menuconfig. cpanminus has never been selectable in any Buildroot stable release, so there is no need to keep compatibility.
That's ok for me too...