Mercurial > repos > iuc > package_r_3_0_1

changeset 6:7c6ec22e9ef0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Mon, 20 Jan 2014 16:15:00 -0500
parents 0a395bcd7efd
children db88858312f6
files tool_dependencies.xml
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu Oct 31 07:13:13 2013 -0400
+++ b/tool_dependencies.xml	Mon Jan 20 16:15:00 2014 -0500
@@ -7,14 +7,15 @@
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://cran.ms.unimelb.edu.au/src/base/R-3/R-3.0.1.tar.gz</action>
-                <!--<action type="set_environment_for_install">
-                    <repository name="package_readline_6_2" owner="iuc">
+                <action type="set_environment_for_install">
+                    <repository changeset_revision="9f3610d5a25b" name="package_readline_6_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.2" />
                     </repository>
-                </action>-->
-
+                </action>
                 <action type="shell_command">
-                    ./configure --with-readline=no --enable-R-shlib  --with-x=no --libdir=$INSTALL_DIR/lib/ --bindir=$INSTALL_DIR/bin/ --datarootdir=$INSTALL_DIR/share/
+                    export LDFLAGS=-L$READLINE_LIB_PATH &amp;&amp; 
+                    export CPPFLAGS=-I$READLINE_INCLUDE_PATH &amp;&amp; 
+                    ./configure --enable-R-shlib  --with-x=no --libdir=$INSTALL_DIR/lib/ --bindir=$INSTALL_DIR/bin/ --datarootdir=$INSTALL_DIR/share/
                 </action>
                 <action type="shell_command">make</action>
                 <action type="shell_command">make install</action>
@@ -22,7 +23,7 @@
                     <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
                     <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/lib/R/bin</environment_variable>
-                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/R/lib</environment_variable>
+                    <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/R/lib</environment_variable>
                     <environment_variable action="set_to" name="RHOME">$INSTALL_DIR/lib/R</environment_variable>
                     <environment_variable action="set_to" name="R_PATH">$INSTALL_DIR/lib/R/bin</environment_variable>
                 </action>