| Message ID | 1404406406-9209-1-git-send-email-francois.perrad@gadz.org |
|---|---|
| State | Superseded |
| Headers | show |
Dear Francois Perrad, On Thu, 3 Jul 2014 18:53:24 +0200, Francois Perrad wrote: > in some case $(2)_CONV_OPT is not enough In title and commit log: s/CONV/CONF/. Also please try to write more detailed commit messages, such as: """ pkg-perl: add support for $(2)_CONF_ENV This commit adds support for specifying additional variables to be passed in the perl Makefile.PL or perl Build.PL executions for packages based on the perl-package infrastructure. """ > > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> > --- > 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 4062646..5046618 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_ENV_OPT+/+HOST_PERL_FOO_ENV_OPT+, to specify additional The name of the options is incorrect here, it should be PERL_FOO_CONF_ENV and HOST_PERL_FOO_CONV_ENV. Thanks, Thomas
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt index 4062646..5046618 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_ENV_OPT+/+HOST_PERL_FOO_ENV_OPT+, 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 5cfdc77..8c45001 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 \
in some case $(2)_CONV_OPT is not enough Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- docs/manual/adding-packages-perl.txt | 4 ++++ package/pkg-perl.mk | 4 ++++ 2 files changed, 8 insertions(+)