changeset 1:c4e889f09f8b draft

Uploaded
author devteam
date Tue, 04 Feb 2014 14:48:52 -0500
parents 32b797e460d8
children 7c1b724614eb
files tool_dependencies.xml
diffstat 1 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Feb 03 11:17:31 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 04 14:48:52 2014 -0500
@@ -1,17 +1,26 @@
 <?xml version="1.0"?>
 <tool_dependency>
+    <package name="libpng" version="1.6.7">
+        <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="pixman" version="0.32.4">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://cairographics.org/releases/pixman-0.32.4.tar.gz</action>
-                <action type="shell_command">./configure --prefix=$INSTALL_DIR</action>
-                <action type="make_install"></action>
+                <action type="set_environment_for_install">
+                    <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>
+                </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 name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
-                    <environment_variable name="PKG_CONFIG_PATH" action="prepend_to">$INSTALL_DIR/lib/pkgconfig</environment_variable>
+                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable action="set_to" name="PIXMAN_LIBS">$INSTALL_DIR/lib</environment_variable>
+                    <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                 </action>
             </actions>
         </install>
-        <readme></readme>
+        <readme />
     </package>
-</tool_dependency>
\ No newline at end of file
+</tool_dependency>