| Previous changeset 0:4f7c800b1050 (2014-03-03) Next changeset 2:f1cf1dd60867 (2016-01-06) |
|
Commit message:
Uploaded tool dependency definition that uses the correct environment variable to specify the PNG library path. |
|
modified:
tool_dependencies.xml |
| b |
| diff -r 4f7c800b1050 -r 8f011e7388e1 tool_dependencies.xml --- a/tool_dependencies.xml Mon Mar 03 16:28:10 2014 -0500 +++ b/tool_dependencies.xml Tue Apr 01 13:16:49 2014 -0400 |
| b |
| @@ -4,10 +4,10 @@ <repository changeset_revision="bcf53d429118" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" /> </package> <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"> - <repository changeset_revision="86bbb06ec11b" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" /> + <repository changeset_revision="34ebf47e4941" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" /> </package> <package name="cairo" version="1.12.14"> <install version="1.0"> @@ -17,15 +17,15 @@ <repository changeset_revision="bcf53d429118" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu"> <package name="pixman" version="0.32.4" /> </repository> - <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> - <repository changeset_revision="86bbb06ec11b" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu"> + <repository changeset_revision="34ebf47e4941" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="http://testtoolshed.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" && \ + export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" && \ ./configure --prefix=$INSTALL_DIR \ --with-x=no \ --enable-xcb-shm=no \ |