NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpanminus: fix installation paths

Browse Source 
perlcross seems to set the installation paths differently than perl's
Configure, so adapt the reference to these paths in cpanminus.

[Francois: install into /usr/lib/perl]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind) 2012-11-28 06:09:22 +00:00 committed by Peter Korsgaard
parent 3ffc4815b7
commit c4fbc4202e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/cpanminus/cpanminus.mk
View File

@ -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 \
@ -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