Mercurial > repos > bgruening > package_rpy2_2_3_6

changeset 10:5744015104ae draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Fri, 24 Jan 2014 05:04:07 -0500
parents 726bdd46a242
children a2b040ce72d7
files tool_dependencies.xml
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Jan 20 17:45:09 2014 -0500
+++ b/tool_dependencies.xml	Fri Jan 24 05:04:07 2014 -0500
@@ -4,14 +4,14 @@
         <repository changeset_revision="1d5b86c2e93d" name="package_r_3_0_1" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="readline" version="6.2">
-        <repository changeset_revision="4e2cf7d7b185" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="rpy2_2_3_6" version="2.3.6">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">https://pypi.python.org/packages/source/r/rpy2/rpy2-2.3.6.tar.gz</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="4e2cf7d7b185" name="package_readline_6_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.2" />
                     </repository>
                     <repository changeset_revision="1d5b86c2e93d" name="package_r_3_0_1" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
@@ -21,13 +21,14 @@
 
                 <action type="shell_command">
                     export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                    export LDFLAGS=-L$READLINE_LIB_PATH &amp;&amp; 
-                    export CPPFLAGS=-I$READLINE_INCLUDE_PATH &amp;&amp; 
+                    export LDFLAGS="-L$READLINE_LIB_PATH -lreadline" &amp;&amp; 
+                    export CPPFLAGS="-I$READLINE_INCLUDE_PATH" &amp;&amp; 
                     python setup.py build --r-home $R_HOME --r-home-lib $R_HOME/lib install --install-lib $INSTALL_DIR/lib/python
                 </action>
                 <action type="set_environment">
                     <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                     <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[READLINE_LIB_PATH]</environment_variable>
+                    <environment_variable action="append_to" name="LD_LIBRARY_PATH">$ENV[RHOME]/lib</environment_variable>
                 </action>
             </actions>
         </install>