Mercurial > repos > bgruening > package_r_3_0_1

changeset 5:baa2b5c8c409 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Mon, 15 Jul 2013 17:11:57 -0400
parents abd431ea5ce0
children 74f16f8cc802
files tool_dependencies.xml
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Jul 10 16:38:56 2013 -0400
+++ b/tool_dependencies.xml	Mon Jul 15 17:11:57 2013 -0400
@@ -6,7 +6,6 @@
     <package name="readline" version="6.2">
         <repository changeset_revision="b936498ae90c" name="package_readline_6_2" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
-
     <package name="R_3_0_1" version="3.0.1">
         <install version="1.0">
             <actions>
@@ -21,17 +20,20 @@
                 </action>
 
                 <action language="cheetah" type="template_command">
-                    #if env.get('READLINE_LIB_PATH', False):
-                        export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
-                        export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp; 
-                    #end if
-
                     #set $cmd = './configure'
                     #if env.get('ATLAS_LIB_DIR', False):
                         #set $cmd += ' --with-blas="-L%s -lptf77blas -lpthread -latlas" ' % $env.ATLAS_LIB_DIR
                     #end if
 
-                    #set $cmd += ' --enable-R-shlib  --with-x=no --with-readline=yes --prefix=%s ' % $env.INSTALL_DIR
+                    #if env.get('READLINE_LIB_PATH', False):
+                        export LDFLAGS=-L$env.READLINE_LIB_PATH &amp;&amp; 
+                        export CPPFLAGS=-I$env.READLINE_INCLUDE_PATH &amp;&amp;
+                        #set $cmd += ' --with-readline=yes '
+                    #else:
+                        #set $cmd += ' --with-readline=no '
+                    #end if
+
+                    #set $cmd += ' --enable-R-shlib  --with-x=no --prefix=%s ' % $env.INSTALL_DIR
                     $cmd
                 </action>
                 <action type="shell_command">make</action>