Mercurial > repos > boris > package_r_2_15
changeset 11:cfb94fd355b6 draft
Uploaded dave's fix
| author | boris |
|---|---|
| date | Tue, 14 Jan 2014 13:10:54 -0500 |
| parents | f6b8f51b71a2 |
| children | dd3c50fe959f |
| files | tool_dependencies.xml |
| diffstat | 1 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/tool_dependencies.xml Sun Jun 09 17:11:08 2013 -0400 +++ b/tool_dependencies.xml Tue Jan 14 13:10:54 2014 -0500 @@ -1,24 +1,21 @@ <?xml version="1.0"?> <tool_dependency> - <package name="readline" version="6.2"> - <repository changeset_revision="1301ec7705a8" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" /> + <package name="readline" version="6.2"> + <repository changeset_revision="984448adbe79" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://gaius.bx.psu.edu:9009" /> </package> <package name="R" version="2.15.0"> - <install version="1.0"> - <actions> - <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.15.0.tar.gz</action> + <install version="1.0"> + <actions> + <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.15.0.tar.gz</action> <action type="set_environment_for_install"> - <repository changeset_revision="1301ec7705a8" name="package_readline_6_2" owner="boris" toolshed="http://testtoolshed.g2.bx.psu.edu/"> - <package name="readline" version="6.2" /> - </repository> + <repository changeset_revision="984448adbe79" name="package_readline_6_2" owner="boris" prior_installation_required="False" toolshed="http://gaius.bx.psu.edu:9009" /> </action> <action type="make_directory">$INSTALL_DIR</action> - <action type="shell_command">./configure --with-blas --with-lapack --enable-R-shlib --with-readline=no --with-x=no --prefix=$INSTALL_DIR && make && make install</action> + <action type="shell_command">export LDFLAGS="-L$READLINE_LIBS -lreadline" && ./configure --with-blas --with-lapack --enable-R-shlib --with-readline=no --with-x=no --prefix=$INSTALL_DIR && make && make install</action> <action type="set_environment"> - <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable> + <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> - </action> </actions> </install>