Mercurial > repos > boris > package_cairo_1_12_14

changeset 2:4e91b26c4fef draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author devteam
date Tue, 04 Feb 2014 15:33:04 -0500
parents b2c181b76e74
children
files tool_dependencies.xml
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Feb 04 09:42:07 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 04 15:33:04 2014 -0500
@@ -1,30 +1,31 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="pixman" version="0.32.4">
-        <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="7c1b724614eb" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <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">
-        <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="f349e776ca59" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="cairo" version="1.12.14">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://depot.galaxyproject.org/package/source/cairo/cairo-1.12.14.tar.bz2</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="7c1b724614eb" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
                         <package name="pixman" version="0.32.4" />
                     </repository>
                     <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>
-                    <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="f349e776ca59" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.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" &amp;&amp; \ 
                     ./configure --prefix=$INSTALL_DIR \
                         --with-x=no \
                         --enable-xcb-shm=no \
@@ -37,6 +38,7 @@
                 <action type="shell_command">touch $INSTALL_DIR/include/cairo/cairo-xlib.h</action>
                 <action type="set_environment">
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable action="prepend_to" name="CAIRO_LIB_PATH">$INSTALL_DIR/lib</environment_variable>
                     <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                 </action>
             </actions>