changeset 4:bd5df464b764

Uploaded tool dependency definition that enables tck/tk for the precompiled linux version.
author devteam
date Tue, 04 Mar 2014 11:20:38 -0500
parents ec964438bb46
children 2c0a13200a73
files tool_dependencies.xml
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Mar 04 08:32:27 2014 -0500
+++ b/tool_dependencies.xml	Tue Mar 04 11:20:38 2014 -0500
@@ -16,6 +16,10 @@
                         <source_directory>.</source_directory>
                         <destination_directory>$INSTALL_DIR</destination_directory>
                     </action>
+                    <action type="set_environment">
+                        <environment_variable action="set_to" name="TCL_LIBRARY">$INSTALL_DIR/lib/libtcl8.4.so</environment_variable>
+                        <environment_variable action="set_to" name="TK_LIBRARY">$INSTALL_DIR/lib/libtk8.4.so</environment_variable>
+                    </action>
                 </actions>
                 <actions>
                     <package name="readline" version="6.2">
@@ -59,7 +63,8 @@
                         export CFLAGS="-I$PNG_INCLUDES -I$READLINE_INCLUDES" &amp;&amp;
                         export CXXFLAGS="-I$PNG_INCLUDES -I$READLINE_INCLUDES" &amp;&amp;
                         export CPPFLAGS="-I$PNG_INCLUDES -I$READLINE_INCLUDES" &amp;&amp;
-                        ./configure --with-blas \
+                        ./configure --with-tcltk \
+                                    --with-blas \
                                     --with-lapack \
                                     --with-readline \
                                     --with-cairo \
@@ -71,7 +76,8 @@
                                     --prefix=$INSTALL_DIR 
                     </action>
                     <action type="make_install" />
-                    <action type="shell_command">sed -i '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/bin/R</action>
+                    <action type="shell_command">sed -i.bak '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_ROOT_DIR">$INSTALL_DIR</environment_variable>
@@ -82,10 +88,10 @@
             </actions_group>
         </install>
         <readme>
-                The precompiled Linux version of this package was built 2014-02-28.
+                The precompiled Linux version of this package was built 2014-03-04.
                 The precompiled OSX version of this package was built 2014-03-03.
                 R is a free software environment for statistical computing and graphics.
-                NOTE: See custom compilation options above 
+                NOTE: See custom compilation options above.
         </readme>
     </package>
 </tool_dependency>