changeset 1:d55c1dc32ad5 draft

Uploaded tool dependency recipe that uses the right environment variable to find libpng.
author devteam
date Mon, 17 Mar 2014 15:11:45 -0400
parents 86bbb06ec11b
children 34ebf47e4941
files tool_dependencies.xml
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Mar 03 16:28:06 2014 -0500
+++ b/tool_dependencies.xml	Mon Mar 17 15:11:45 2014 -0400
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <tool_dependency>
   <package name="libpng" version="1.6.7">
-      <repository changeset_revision="a0b0e0281cc4" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.5.2">
       <install version="1.0">
           <actions>
               <action type="download_by_url">http://download.savannah.gnu.org/releases/freetype/freetype-2.5.2.tar.gz</action>
                 <action type="set_environment_for_install">
-                  <repository changeset_revision="a0b0e0281cc4" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                  <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu">
                       <package name="libpng" version="1.6.7" />
                     </repository>
                 </action>
-                <action type="shell_command">export LDFLAGS="-Wl,-rpath,$PNG_LIB_PATH" &amp;&amp; ./configure --prefix=$INSTALL_DIR</action>
+                <action type="shell_command">export LDFLAGS="-Wl,-rpath,$PNG_LIBS" &amp;&amp; ./configure --prefix=$INSTALL_DIR</action>
                 <action type="make_install" />
                 <action type="set_environment">
                   <environment_variable action="set_to" name="FREETYPE_LIB_PATH">$INSTALL_DIR/lib</environment_variable>