From 734b34f520ab0a14a9c54341e32bd067058b7996 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 13 Jul 2014 15:03:21 +0200 Subject: [PATCH] infra/pkg-perl: add possibility to pass extra env at configure time Some perl packages may use environment variables as a hint to know how to be configured. That's for example the case for perl-net-ssleay that uses OPENSSL_PREFIX, if it is set in the environment, as the prefix to openssl. Add a new variable that packages can set if they need extra environment variables. Update the manual accordingly. Signed-off-by: Francois Perrad Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" [yann.morin.1998@free.fr: enhance the commit log] Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-perl.txt | 4 ++++ package/pkg-perl.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt index 4062646f45..d1a1616916 100644 --- a/docs/manual/adding-packages-perl.txt +++ b/docs/manual/adding-packages-perl.txt @@ -100,6 +100,10 @@ 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_ENV+/+HOST_PERL_FOO_CONF_ENV+, to specify additional + environment variables to pass to the +perl Makefile.PL+ or +perl Build.PL+. + By default, empty. + * +PERL_FOO_CONF_OPT+/+HOST_PERL_FOO_CONF_OPT+, to specify additional configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+. By default, empty. diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk index 5cfdc77370..8c45001616 100644 --- a/package/pkg-perl.mk +++ b/package/pkg-perl.mk @@ -49,6 +49,7 @@ ifeq ($(4),target) # Configure package for target define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \ + $$($(2)_CONF_ENV) \ PERL_MM_USE_DEFAULT=1 \ perl Build.PL \ --config ar="$$(TARGET_AR)" \ @@ -69,6 +70,7 @@ define $(2)_CONFIGURE_CMDS --install_path libdoc=/usr/share/man/man3 \ $$($(2)_CONF_OPT); \ else \ + $$($(2)_CONF_ENV) \ PERL_MM_USE_DEFAULT=1 \ PERL_AUTOINSTALL=--skipdeps \ perl Makefile.PL \ @@ -95,12 +97,14 @@ else # Configure package for host define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \ + $$($(2)_CONF_ENV) \ PERL_MM_USE_DEFAULT=1 \ perl Build.PL \ --install_base $$(HOST_DIR)/usr \ --installdirs vendor \ $$($(2)_CONF_OPT); \ else \ + $$($(2)_CONF_ENV) \ PERL_MM_USE_DEFAULT=1 \ PERL_AUTOINSTALL=--skipdeps \ perl Makefile.PL \ -- 2.30.2