diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-12-02 17:19:40 -0800 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-12-02 17:19:40 -0800 |
commit | 8cdabd76950e227af088729c53c7f741a46bd9cc (patch) | |
tree | 86f11d84d46f9a5cc6be78b425b07bb58abb5d93 /package/cpanminus/cpanminus.mk | |
parent | 677d5068b955cf713b73d285e41ec8eedbda8e38 (diff) | |
parent | c4fbc4202ea47829396bc446e84fd85153513974 (diff) | |
download | buildroot-novena-8cdabd76950e227af088729c53c7f741a46bd9cc.tar.gz buildroot-novena-8cdabd76950e227af088729c53c7f741a46bd9cc.zip |
Merge branch 'next'
Kickoff 2013.02 cycle
Diffstat (limited to 'package/cpanminus/cpanminus.mk')
-rw-r--r-- | package/cpanminus/cpanminus.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/cpanminus/cpanminus.mk b/package/cpanminus/cpanminus.mk index d3a338b0b..e7e3f2959 100644 --- a/package/cpanminus/cpanminus.mk +++ b/package/cpanminus/cpanminus.mk @@ -7,12 +7,12 @@ CPANMINUS_VERSION = 1.5018 CPANMINUS_SOURCE = miyagawa-cpanminus-$(CPANMINUS_VERSION)-0-gee6cd30.tar.gz CPANMINUS_SITE = https://github.com/miyagawa/cpanminus/tarball/$(CPANMINUS_VERSION) -CPANMINUS_DEPENDENCIES = perl $(call qstrip,$(BR2_PACKAGE_CPANMINUS_NATIVE_DEPENDENCIES)) +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_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 \ @@ -36,7 +36,7 @@ define CPANMINUS_INSTALL_TARGET_CMDS --no-man-pages \ $(CPANMINUS_MIRROR) \ $(call qstrip,$(BR2_PACKAGE_CPANMINUS_MODULES)) - find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \; + -find $(CPANMINUS_PERL_SITEARCH) -type f -name *.bs -exec rm -f {} \; endef else define CPANMINUS_INSTALL_TARGET_CMDS |