| Previous changeset 0:86bbb06ec11b (2014-03-03) Next changeset 2:34ebf47e4941 (2014-03-17) |
|
Commit message:
Uploaded tool dependency recipe that uses the right environment variable to find libpng. |
|
modified:
tool_dependencies.xml |
| b |
| diff -r 86bbb06ec11b -r d55c1dc32ad5 tool_dependencies.xml --- a/tool_dependencies.xml Mon Mar 03 16:28:06 2014 -0500 +++ b/tool_dependencies.xml Mon Mar 17 15:11:45 2014 -0400 |
| b |
| @@ -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" && ./configure --prefix=$INSTALL_DIR</action> + <action type="shell_command">export LDFLAGS="-Wl,-rpath,$PNG_LIBS" && ./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> |