| Message ID | 1352558468-3643-2-git-send-email-francois.perrad@gadz.org |
|---|---|
| State | Superseded |
| Headers | show |
On 10/11/12 15:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad<francois.perrad@gadz.org> > --- > package/cpanminus/cpanminus.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk > index af35e93..e07ef38 100644 > --- a/package/cpanminus/cpanminus.mk > +++ b/package/cpanminus/cpanminus.mk > @@ -11,8 +11,8 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA > > 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_LIB = $(STAGING_DIR)/usr/lib/perl > +CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl > 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) > @@ -27,8 +27,8 @@ define CPANMINUS_INSTALL_TARGET_CMDS > 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)" \ > + PERL_MM_OPT="DESTDIR=$(CPANMINUS_PERL_SITELIB) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \ > + PERL_MB_OPT="--destdir $(CPANMINUS_PERL_SITELIB)" \ I merged this change as well in my own version of this patch. Regards, Arnout
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk index af35e93..e07ef38 100644 --- a/package/cpanminus/cpanminus.mk +++ b/package/cpanminus/cpanminus.mk @@ -11,8 +11,8 @@ CPANMINUS_DEPENDENCIES = host-qemu perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NA 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_LIB = $(STAGING_DIR)/usr/lib/perl +CPANMINUS_PERL_SITELIB = $(TARGET_DIR)/usr/lib/perl 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) @@ -27,8 +27,8 @@ define CPANMINUS_INSTALL_TARGET_CMDS 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)" \ + PERL_MM_OPT="DESTDIR=$(CPANMINUS_PERL_SITELIB) PERL=$(@D)/run_perl PERL_LIB=$(CPANMINUS_PERL_LIB) PERL_ARCHLIB=$(CPANMINUS_PERL_ARCHLIB)" \ + PERL_MB_OPT="--destdir $(CPANMINUS_PERL_SITELIB)" \ RUN_PERL="$(@D)/run_perl" \ $(CPANMINUS_RUN_PERL) $(@D)/cpanm \ --perl=$(@D)/run_perl \
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- package/cpanminus/cpanminus.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)