Mercurial > repos > boris > package_r_2_15_0

changeset 2:7c787544383f draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author devteam
date Tue, 04 Feb 2014 15:56:44 -0500
parents eca882dd6393
children
files tool_dependencies.xml
diffstat 1 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Feb 04 08:54:51 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 04 15:56:44 2014 -0500
@@ -7,13 +7,13 @@
         <repository changeset_revision="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="cairo" version="1.12.14">
-        <repository changeset_revision="0e7e9b619f24" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="4e91b26c4fef" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="pixman" version="0.32.4">
-        <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="7c1b724614eb" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.5.2">
-        <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="f349e776ca59" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="R" version="2.15.0">
         <install version="1.0">
@@ -26,21 +26,25 @@
                     <repository changeset_revision="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="libpng" version="1.6.7" />
                     </repository>
-                    <repository changeset_revision="0e7e9b619f24" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="4e91b26c4fef" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="cairo" version="1.12.14" />
                     </repository>
-                    <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="7c1b724614eb" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="pixman" version="0.32.4" />
                     </repository>
-                    <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="f349e776ca59" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="freetype" version="2.5.2" />
                     </repository>
                 </action>
                 <action type="shell_command">
-                    export LDFLAGS="-L$PNG_LIBS -L$READLINE_LIBS" &amp;&amp; \
-                    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; \
+                    export LDFLAGS="-L$PNG_LIBS -L$READLINE_LIBS" &amp;&amp;
+                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$READLINE_LIBS" &amp;&amp;
+                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$PIXMAN_LIB_PATH" &amp;&amp;
+                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$PNG_LIB_PATH" &amp;&amp;
+                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp;
+                    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 \
                                 --with-lapack \
                                 --with-readline \
@@ -49,6 +53,7 @@
                                 --without-x \
                                 --enable-R-shlib \
                                 --disable-R-framework \
+                                --libdir=$INSTALL_DIR/lib \
                                 --prefix=$INSTALL_DIR 
                 </action>
                 <action type="make_install" />