changeset 1:b52d7367319a draft

Uploaded
author devteam
date Tue, 04 Feb 2014 15:25:52 -0500
parents 261854cf7ae9
children f349e776ca59
files tool_dependencies.xml
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Feb 03 11:17:36 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 04 15:25:52 2014 -0500
@@ -1,19 +1,22 @@
 <?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 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="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>
+        <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="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+                    <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">./configure --prefix=$INSTALL_DIR</action>
+                <action type="shell_command">export LDFLAGS="-Wl,-rpath,$PNG_LIB_PATH &amp;&amp; ./configure --prefix=$INSTALL_DIR</action>
                 <action type="make_install" />
                 <action type="set_environment">
-                  <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable action="set_to" name="FREETYPE_LIB_PATH">$INSTALL_DIR/lib</environment_variable>
+                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                 </action>
             </actions>