Mercurial > repos > iuc > package_r_3_0_3
changeset 3:e509651776fa draft
Uploaded
| author | iuc |
|---|---|
| date | Wed, 18 Feb 2015 11:33:40 -0500 |
| parents | 9ff23e0b280b |
| children | d9a880d95c4e |
| files | tool_dependencies.xml |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tool_dependencies.xml Tue Jun 24 15:44:08 2014 -0400 +++ b/tool_dependencies.xml Wed Feb 18 11:33:40 2015 -0500 @@ -24,7 +24,7 @@ </actions> <actions> <package name="readline" version="6.2"> - <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" /> + <repository changeset_revision="4e4f3dc94efa" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" /> </package> <package name="libpng" version="1.6.7"> <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" /> @@ -40,7 +40,7 @@ </package> <action type="download_by_url">http://cran.rstudio.com/src/base/R-3/R-3.0.3.tar.gz</action> <action type="set_environment_for_install"> - <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu"> + <repository changeset_revision="4e4f3dc94efa" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu"> <package name="readline" version="6.2" /> </repository> <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu"> @@ -75,11 +75,11 @@ --enable-R-shlib \ --disable-R-framework \ --libdir=$INSTALL_DIR/lib \ - --prefix=$INSTALL_DIR + --prefix=$INSTALL_DIR </action> <action type="make_install" /> - <action type="shell_command">sed -i.bak 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action> - <action type="shell_command">sed -i.bak 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R</action> + <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action> + <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R</action> </actions> <action type="set_environment"> <environment_variable action="set_to" name="R_DOC_DIR">$INSTALL_DIR/lib/R/doc</environment_variable> @@ -87,10 +87,11 @@ <environment_variable action="set_to" name="R_INCLUDE_DIR">$INSTALL_DIR/lib/R/include</environment_variable> <environment_variable action="set_to" name="R_SHARE_DIR">$INSTALL_DIR/lib/R/share</environment_variable> <environment_variable action="set_to" name="R_ROOT_DIR">$INSTALL_DIR</environment_variable> - <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable> + <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR</environment_variable> <environment_variable action="set_to" name="RHOME">$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/bin</environment_variable> + <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/R/lib</environment_variable> </action> </actions_group> </install>