diff tool_dependencies.xml @ 1:b39299b4b6e1 draft

Uploaded tool dependency definition that uses the correct environment variable to specify the PNG library path.
author devteam
date Tue, 01 Apr 2014 13:12:09 -0400
parents 7f467a4010e0
children f5ab0fdf3716
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Mar 07 11:04:43 2014 -0500
+++ b/tool_dependencies.xml	Tue Apr 01 13:12:09 2014 -0400
@@ -4,10 +4,10 @@
       <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpng" version="1.6.7">
-      <repository changeset_revision="7c4a9189b712" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.5.2">
-      <repository changeset_revision="92d1906a12e4" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="58782940c411" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="cairo" version="1.12.14">
       <install version="1.0">
@@ -17,15 +17,15 @@
                   <repository changeset_revision="3d44a209a6b9" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                       <package name="pixman" version="0.32.4" />
                     </repository>
-                    <repository changeset_revision="7c4a9189b712" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                       <package name="libpng" version="1.6.7" />
                     </repository>
-                    <repository changeset_revision="92d1906a12e4" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="58782940c411" name="package_freetype_2_5_2" owner="devteam" 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="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$PNG_LIB_PATH -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp; \ 
+                    export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp; \ 
                     ./configure --prefix=$INSTALL_DIR \
                         --with-x=no \
                         --enable-xcb-shm=no \