changeset 6:8cf570efdd1e draft

Minor change to ensure installed perl is used when installing local-lib
author iuc
date Tue, 05 Nov 2013 17:40:13 -0500
parents 978287122b91
children 43ce4d7c22a3
files tool_dependencies.xml
diffstat 1 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Nov 05 12:24:23 2013 -0500
+++ b/tool_dependencies.xml	Tue Nov 05 17:40:13 2013 -0500
@@ -14,22 +14,13 @@
                 <!-- TODO: Here we need to use the new installed perl binary -->
                 <action type="shell_command">$INSTALL_DIR/bin/perl Makefile.PL --bootstrap=$INSTALL_DIR/local-lib/ --no-manpages</action>
                 <action type="shell_command">make install</action>
-                <action type="shell_command">eval $(perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
+                <action type="shell_command">eval $($INSTALL_DIR/bin/perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
 
                 <!-- install cpanminus into our new perl environment -->
                 <action type="download_file">https://raw.github.com/miyagawa/cpanminus/c0c88f71118ecec334d62ba280e883933e7a6d39/cpanm</action>
                 <!-- prepanding means that the new install perl binary will be used after the pipe -->
                 <action type="shell_command">export PERL5LIB=$INSTALL_DIR/lib/perl5/:$PERL5LIB ; export PATH=$INSTALL_DIR/bin/:$PATH ; cat cpanm | perl - App::cpanminus</action>
 
-                <!--
-                <action type="chmod">
-                    <file mode="750">cpanm</file>
-                </action>
-                <action type="move_file">
-                    <source>cpanm</source>
-                    <destination>$INSTALL_DIR/bin/</destination>
-                </action>
-                -->
                 <action type="set_environment">
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable name="PERL5LIB" action="prepend_to">$INSTALL_DIR/lib/perl5</environment_variable>