* [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-10 7:07 ` Arnout Vandecappelle
2014-02-10 7:17 ` Arnout Vandecappelle
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure Francois Perrad
` (6 subsequent siblings)
7 siblings, 2 replies; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/Makefile.in | 11 +++++++----
package/intltool/intltool.mk | 2 --
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 2e433fd..d0b1cfd 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -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
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index b2418fe..58b46e6 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB Francois Perrad
@ 2014-02-10 7:07 ` Arnout Vandecappelle
2014-02-10 7:17 ` Arnout Vandecappelle
1 sibling, 0 replies; 21+ messages in thread
From: Arnout Vandecappelle @ 2014-02-10 7:07 UTC (permalink / raw)
To: buildroot
On 02/07/14 09:55, Francois Perrad wrote:
> 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.
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
--
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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB Francois Perrad
2014-02-10 7:07 ` Arnout Vandecappelle
@ 2014-02-10 7:17 ` Arnout Vandecappelle
1 sibling, 0 replies; 21+ messages in thread
From: Arnout Vandecappelle @ 2014-02-10 7:17 UTC (permalink / raw)
To: buildroot
On 02/07/14 09:55, Francois Perrad wrote:
> 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.
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/Makefile.in | 11 +++++++----
> package/intltool/intltool.mk | 2 --
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/package/Makefile.in b/package/Makefile.in
> index 2e433fd..d0b1cfd 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -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
> +
> 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
> diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
> index b2418fe..58b46e6 100644
> --- a/package/intltool/intltool.mk
> +++ b/package/intltool/intltool.mk
> @@ -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))
>
--
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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 20:33 ` Thomas De Schampheleire
2014-02-10 7:16 ` Arnout Vandecappelle
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 3/8] scancpan: a new script Francois Perrad
` (5 subsequent siblings)
7 siblings, 2 replies; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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
diff --git a/Config.in b/Config.in
index 7ec7c2a..678fe8d 100644
--- a/Config.in
+++ b/Config.in
@@ -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
diff --git a/package/Makefile.in b/package/Makefile.in
index d0b1cfd..41f73cb 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -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
diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
new file mode 100644
index 0000000..bf9fddf
--- /dev/null
+++ b/package/pkg-perl.mk
@@ -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
+# 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 ?=
+
+#
+# Configure step. Only define it if not already defined by the package
+# .mk file. And take care of the differences between host and target
+# packages.
+#
+ifndef $(2)_CONFIGURE_CMDS
+ifeq ($(4),target)
+
+# Configure package for target
+define $(2)_CONFIGURE_CMDS
+ cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ perl Build.PL \
+ --config ar="$(TARGET_AR)" \
+ --config full_ar="$(TARGET_AR)" \
+ --config cc="$(TARGET_CC)" \
+ --config ccflags="$(TARGET_CFLAGS)" \
+ --config ld="$(TARGET_CC)" \
+ --config lddlflags="-shared $(TARGET_LDFLAGS)" \
+ --config ldflags="$(TARGET_LDFLAGS)" \
+ --include_dirs $$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$(PKG_PERL_ARCHNAME)/CORE \
+ --destdir $$(TARGET_DIR) \
+ --installdirs vendor \
+ --install_path lib=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \
+ --install_path arch=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$(PKG_PERL_ARCHNAME) \
+ --install_path bin=/usr/bin \
+ --install_path script=/usr/bin \
+ --install_path bindoc=/usr/share/man/man1 \
+ --install_path libdoc=/usr/share/man/man3 \
+ $$($(2)_CONF_OPT); \
+ else \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ PERL_AUTOINSTALL=--skipdeps \
+ perl Makefile.PL \
+ AR="$(TARGET_AR)" \
+ FULL_AR="$(TARGET_AR)" \
+ CC="$(TARGET_CC)" \
+ CCFLAGS="$(TARGET_CFLAGS)" \
+ LD="$(TARGET_CC)" \
+ LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ DESTDIR=$$(TARGET_DIR) \
+ INSTALLDIRS=vendor \
+ INSTALLVENDORLIB=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \
+ INSTALLVENDORARCH=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$(PKG_PERL_ARCHNAME) \
+ INSTALLVENDORBIN=/usr/bin \
+ INSTALLVENDORSCRIPT=/usr/bin \
+ INSTALLVENDORMAN1DIR=/usr/share/man/man1 \
+ INSTALLVENDORMAN3DIR=/usr/share/man/man3 \
+ $$($(2)_CONF_OPT); \
+ fi
+endef
+else
+
+# Configure package for host
+define $(2)_CONFIGURE_CMDS
+ cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ perl Build.PL \
+ --install_base $$(HOST_DIR)/usr \
+ --installdirs vendor \
+ $$($(2)_CONF_OPT); \
+ else \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ PERL_AUTOINSTALL=--skipdeps \
+ perl Makefile.PL \
+ INSTALL_BASE=$$(HOST_DIR)/usr \
+ INSTALLDIRS=vendor \
+ $$($(2)_CONF_OPT); \
+ fi
+endef
+endif
+endif
+
+#
+# Build step. Only define it if not already defined by the package .mk
+# file. And take care of the differences between host and target
+# packages.
+#
+ifndef $(2)_BUILD_CMDS
+ifeq ($(4),target)
+
+# Build package for target
+define $(2)_BUILD_CMDS
+ cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ perl Build $$($(2)_BUILD_OPT) build; \
+ else \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ $(MAKE1) \
+ PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$(PKG_PERL_ARCHNAME)/CORE \
+ $$($(2)_BUILD_OPT) pure_all; \
+ fi
+endef
+else
+
+# Build package for host
+define $(2)_BUILD_CMDS
+ cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ perl Build $$($(2)_BUILD_OPT) build; \
+ else \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ $(MAKE1) $$($(2)_BUILD_OPT) pure_all; \
+ fi
+endef
+endif
+endif
+
+#
+# Host installation step. Only define it if not already defined by the
+# package .mk file.
+#
+ifndef $(2)_INSTALL_CMDS
+define $(2)_INSTALL_CMDS
+ cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
+ else \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ $(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
+ fi
+endef
+endif
+
+#
+# Target installation step. Only define it if not already defined by
+# the package .mk file.
+#
+ifndef $(2)_INSTALL_TARGET_CMDS
+define $(2)_INSTALL_TARGET_CMDS
+ cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
+ else \
+ PERL5LIB=$(HOST_PERL5LIB) \
+ $(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
+ fi
+endef
+endif
+
+# Call the generic package infrastructure to generate the necessary
+# make targets
+$(call inner-generic-package,$(1),$(2),$(3),$(4))
+
+endef
+
+################################################################################
+# perl-package -- the target generator macro for Perl packages
+################################################################################
+
+perl-package = $(call inner-perl-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
+host-perl-package = $(call inner-perl-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure Francois Perrad
@ 2014-02-07 20:33 ` Thomas De Schampheleire
2014-02-10 7:16 ` Arnout Vandecappelle
1 sibling, 0 replies; 21+ messages in thread
From: Thomas De Schampheleire @ 2014-02-07 20:33 UTC (permalink / raw)
To: buildroot
Hi Francois,
On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> 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
>
> diff --git a/Config.in b/Config.in
> index 7ec7c2a..678fe8d 100644
> --- a/Config.in
> +++ b/Config.in
> @@ -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
> +
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 ... "
> endmenu
>
> config BR2_JLEVEL
> diff --git a/package/Makefile.in b/package/Makefile.in
> index d0b1cfd..41f73cb 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -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
> diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
> new file mode 100644
> index 0000000..bf9fddf
> --- /dev/null
> +++ b/package/pkg-perl.mk
> @@ -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
> +# 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
^ permalink raw reply [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure Francois Perrad
2014-02-07 20:33 ` Thomas De Schampheleire
@ 2014-02-10 7:16 ` Arnout Vandecappelle
1 sibling, 0 replies; 21+ messages in thread
From: Arnout Vandecappelle @ 2014-02-10 7:16 UTC (permalink / raw)
To: buildroot
On 02/07/14 09:55, Francois Perrad wrote:
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> 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
>
> diff --git a/Config.in b/Config.in
> index 7ec7c2a..678fe8d 100644
> --- a/Config.in
> +++ b/Config.in
> @@ -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
> diff --git a/package/Makefile.in b/package/Makefile.in
> index d0b1cfd..41f73cb 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -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
perl comes before python.
> include package/pkg-generic.mk
> diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
> new file mode 100644
> index 0000000..bf9fddf
> --- /dev/null
> +++ b/package/pkg-perl.mk
> @@ -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
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.
> +
> +################################################################################
> +# 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
> +# 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]
--
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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 3/8] scancpan: a new script
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 1/8] host-perl: refactor and rename PERL5LIB Francois Perrad
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 2/8] pkg-perl: new infrastructure Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 4/8] host-perl-xml-parser: rename and refactor with perl infrastructure Francois Perrad
` (4 subsequent siblings)
7 siblings, 0 replies; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
which creates Perl/CPAN package files
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
support/scripts/scancpan | 694 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 694 insertions(+)
create mode 100755 support/scripts/scancpan
diff --git a/support/scripts/scancpan b/support/scripts/scancpan
new file mode 100755
index 0000000..90ecae4
--- /dev/null
+++ b/support/scripts/scancpan
@@ -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 <nperez@cpan.org>
+
+ =head1 COPYRIGHT AND LICENSE
+
+ This software is copyright (c) 2013 by Nicholas R. Perez <nperez@cpan.org>.
+
+ 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 4/8] host-perl-xml-parser: rename and refactor with perl infrastructure
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
` (2 preceding siblings ...)
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 3/8] scancpan: a new script Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 20:36 ` Thomas De Schampheleire
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 5/8] host-perl-module-build: new package Francois Perrad
` (3 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
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.
In addition to this rename, the package is converted to use the newly
introduced Perl package infrastructure.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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
diff --git a/package/Config.in b/package/Config.in
index ee2a68e..0d81a7f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 58b46e6..6b2a704 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -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))
diff --git a/package/libxml-parser-perl/Config.in b/package/libxml-parser-perl/Config.in
deleted file mode 100644
index bdda236..0000000
--- a/package/libxml-parser-perl/Config.in
+++ /dev/null
@@ -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/
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
deleted file mode 100644
index 53f3bcf..0000000
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ /dev/null
@@ -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))
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 9306b00..18f5c76 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -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 \
diff --git a/package/perl-xml-parser/perl-xml-parser.mk b/package/perl-xml-parser/perl-xml-parser.mk
new file mode 100644
index 0000000..40ded41
--- /dev/null
+++ b/package/perl-xml-parser/perl-xml-parser.mk
@@ -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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 4/8] host-perl-xml-parser: rename and refactor with perl infrastructure
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 4/8] host-perl-xml-parser: rename and refactor with perl infrastructure Francois Perrad
@ 2014-02-07 20:36 ` Thomas De Schampheleire
0 siblings, 0 replies; 21+ messages in thread
From: Thomas De Schampheleire @ 2014-02-07 20:36 UTC (permalink / raw)
To: buildroot
On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
> 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.
>
> In addition to this rename, the package is converted to use the newly
> introduced Perl package infrastructure.
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 5/8] host-perl-module-build: new package
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
` (3 preceding siblings ...)
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 4/8] host-perl-xml-parser: rename and refactor with perl infrastructure Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 20:41 ` Thomas De Schampheleire
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 6/8] perl: remove useless patch Francois Perrad
` (2 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
the version coming with host-perl is too old
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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
diff --git a/package/perl-module-build/perl-module-build.mk b/package/perl-module-build/perl-module-build.mk
new file mode 100644
index 0000000..c726c2a
--- /dev/null
+++ b/package/perl-module-build/perl-module-build.mk
@@ -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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 5/8] host-perl-module-build: new package
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 5/8] host-perl-module-build: new package Francois Perrad
@ 2014-02-07 20:41 ` Thomas De Schampheleire
0 siblings, 0 replies; 21+ messages in thread
From: Thomas De Schampheleire @ 2014-02-07 20:41 UTC (permalink / raw)
To: buildroot
On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
> the version coming with host-perl is too old
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> 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
>
> diff --git a/package/perl-module-build/perl-module-build.mk b/package/perl-module-build/perl-module-build.mk
> new file mode 100644
> index 0000000..c726c2a
> --- /dev/null
> +++ b/package/perl-module-build/perl-module-build.mk
> @@ -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))
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 6/8] perl: remove useless patch
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
` (4 preceding siblings ...)
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 5/8] host-perl-module-build: new package Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 7/8] manual: adding packages perl Francois Perrad
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it Francois Perrad
7 siblings, 0 replies; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
The 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.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/perl/perl-fix-Module-Build.patch | 16 ----------------
1 file changed, 16 deletions(-)
delete mode 100644 package/perl/perl-fix-Module-Build.patch
diff --git a/package/perl/perl-fix-Module-Build.patch b/package/perl/perl-fix-Module-Build.patch
deleted file mode 100644
index 9101c11..0000000
--- a/package/perl/perl-fix-Module-Build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 7/8] manual: adding packages perl
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
` (5 preceding siblings ...)
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 6/8] perl: remove useless patch Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 20:49 ` Thomas De Schampheleire
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it Francois Perrad
7 siblings, 1 reply; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
new file mode 100644
index 0000000..1e48df9
--- /dev/null
+++ b/docs/manual/adding-packages-perl.txt
@@ -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.
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index cc86529..745e33a 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -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[]
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 7/8] manual: adding packages perl
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 7/8] manual: adding packages perl Francois Perrad
@ 2014-02-07 20:49 ` Thomas De Schampheleire
2014-02-08 9:00 ` François Perrad
0 siblings, 1 reply; 21+ messages in thread
From: Thomas De Schampheleire @ 2014-02-07 20:49 UTC (permalink / raw)
To: buildroot
Hi Francois,
On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> 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
>
> diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
> new file mode 100644
> index 0000000..1e48df9
> --- /dev/null
> +++ b/docs/manual/adding-packages-perl.txt
> @@ -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
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:
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Thanks,
Thomas
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 7/8] manual: adding packages perl
2014-02-07 20:49 ` Thomas De Schampheleire
@ 2014-02-08 9:00 ` François Perrad
0 siblings, 0 replies; 21+ messages in thread
From: François Perrad @ 2014-02-08 9:00 UTC (permalink / raw)
To: buildroot
2014-02-07 21:49 GMT+01:00 Thomas De Schampheleire <patrickdepinguin@gmail.com>:
> Hi Francois,
>
> On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
>>
>> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>> ---
>> 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
>>
>> diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
>> new file mode 100644
>> index 0000000..1e48df9
>> --- /dev/null
>> +++ b/docs/manual/adding-packages-perl.txt
>> @@ -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
>
> 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.
>
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
> Other than that:
> Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> Thanks,
> Thomas
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it
2014-02-07 8:55 [Buildroot] [pkg-perl infra V5 0/8] a package infrastructure for Perl/CPAN modules Francois Perrad
` (6 preceding siblings ...)
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 7/8] manual: adding packages perl Francois Perrad
@ 2014-02-07 8:55 ` Francois Perrad
2014-02-07 20:50 ` Thomas De Schampheleire
7 siblings, 1 reply; 21+ messages in thread
From: Francois Perrad @ 2014-02-07 8:55 UTC (permalink / raw)
To: buildroot
cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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
diff --git a/package/Config.in b/package/Config.in
index 0d81a7f..c4dac6c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/cpanminus/Config.in b/package/cpanminus/Config.in
deleted file mode 100644
index b10d211..0000000
--- a/package/cpanminus/Config.in
+++ /dev/null
@@ -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
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk
deleted file mode 100644
index b315388..0000000
--- a/package/cpanminus/cpanminus.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-################################################################################
-#
-# cpanminus
-#
-################################################################################
-
-CPANMINUS_VERSION = 1.6109
-CPANMINUS_SOURCE = $(CPANMINUS_VERSION).tar.gz
-CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/archive
-CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES))
-
-CPANMINUS_RUN_PERL = $(QEMU_USER) $(STAGING_DIR)/usr/bin/perl
-CPANMINUS_ARCHNAME = $(shell $(CPANMINUS_RUN_PERL) -MConfig -e "print Config->{archname}")
-CPANMINUS_PERL_LIB = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)
-CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl5/site_perl/$(PERL_VERSION)
-CPANMINUS_PERL_ARCHLIB = $(CPANMINUS_PERL_LIB)/$(CPANMINUS_ARCHNAME)
-CPANMINUS_PERL_SITEARCH = $(CPANMINUS_PERL_SITELIB)/$(CPANMINUS_ARCHNAME)
-CPANMINUS_PERL5LIB = $(CPANMINUS_PERL_SITEARCH):$(CPANMINUS_PERL_SITELIB):$(CPANMINUS_PERL_ARCHLIB):$(CPANMINUS_PERL_LIB)
-ifneq ($(BR2_PACKAGE_CPANMINUS_MIRROR),"")
- CPANMINUS_MIRROR = --mirror $(call qstrip,$(BR2_PACKAGE_CPANMINUS_MIRROR)) --mirror-only
-endif
-CPANMINUS_MODULES = $(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
-
-ifneq ($(CPANMINUS_MODULES),)
-define CPANMINUS_INSTALL_TARGET_CMDS
- echo "#!/bin/sh" > $(@D)/run_perl
- echo "PERL5LIB=$(CPANMINUS_PERL5LIB) $(CPANMINUS_RUN_PERL) \"\$$@\"" >>$(@D)/run_perl
- chmod +x $(@D)/run_perl
- PERL5LIB=$(CPANMINUS_PERL5LIB) \
- PERL_MM_OPT="DESTDIR=$(TARGET_DIR) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \
- PERL_MB_OPT="--destdir $(TARGET_DIR)" \
- RUN_PERL="$(@D)/run_perl" \
- $(CPANMINUS_RUN_PERL) $(@D)/cpanm \
- --perl=$(@D)/run_perl \
- --notest \
- --no-man-pages \
- $(CPANMINUS_MIRROR) \
- $(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES))
- -find $(CPANMINUS_PERL_SITELIB) -type f -name *.bs -exec rm -f {} \;
-endef
-else
-define CPANMINUS_INSTALL_TARGET_CMDS
- @echo "No modules to install"
-endef
-endif
-
-$(eval $(generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it
2014-02-07 8:55 ` [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it Francois Perrad
@ 2014-02-07 20:50 ` Thomas De Schampheleire
2014-02-08 8:18 ` François Perrad
0 siblings, 1 reply; 21+ messages in thread
From: Thomas De Schampheleire @ 2014-02-07 20:50 UTC (permalink / raw)
To: buildroot
Hi Fran?ois,
On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
> cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> 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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it
2014-02-07 20:50 ` Thomas De Schampheleire
@ 2014-02-08 8:18 ` François Perrad
2014-02-10 18:29 ` Thomas Petazzoni
0 siblings, 1 reply; 21+ messages in thread
From: François Perrad @ 2014-02-08 8:18 UTC (permalink / raw)
To: buildroot
2014-02-07 21:50 GMT+01:00 Thomas De Schampheleire <patrickdepinguin@gmail.com>:
> Hi Fran?ois,
>
> On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
>> cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
>>
>> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>> ---
>> 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?
>
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
> Best regards,
> Thomas
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it
2014-02-08 8:18 ` François Perrad
@ 2014-02-10 18:29 ` Thomas Petazzoni
2014-02-10 18:56 ` Thomas De Schampheleire
0 siblings, 1 reply; 21+ messages in thread
From: Thomas Petazzoni @ 2014-02-10 18:29 UTC (permalink / raw)
To: buildroot
Dear Fran?ois Perrad,
On Sat, 8 Feb 2014 09:18:08 +0100, Fran?ois Perrad wrote:
> 2014-02-07 21:50 GMT+01:00 Thomas De Schampheleire <patrickdepinguin@gmail.com>:
> > Hi Fran?ois,
> >
> > On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
> >> cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
> >>
> >> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> >> ---
> >> 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?
> >
>
> 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [pkg-perl infra V5 8/8] cpanminus: remove it
2014-02-10 18:29 ` Thomas Petazzoni
@ 2014-02-10 18:56 ` Thomas De Schampheleire
0 siblings, 0 replies; 21+ messages in thread
From: Thomas De Schampheleire @ 2014-02-10 18:56 UTC (permalink / raw)
To: buildroot
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> schreef:
>Dear Fran?ois Perrad,
>
>On Sat, 8 Feb 2014 09:18:08 +0100, Fran?ois Perrad wrote:
>> 2014-02-07 21:50 GMT+01:00 Thomas De Schampheleire <patrickdepinguin@gmail.com>:
>> > Hi Fran?ois,
>> >
>> > On Fri, Feb 7, 2014 at 9:55 AM, Francois Perrad <fperrad@gmail.com> wrote:
>> >> cpanminus was marked as broken, now it becomes useless with the Perl infrastructure.
>> >>
>> >> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>> >> ---
>> >> 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?
>> >
>>
>> 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.
>
That's ok for me too...
^ permalink raw reply [flat|nested] 21+ messages in thread