| Previous changeset 2:c41942395d25 (2015-10-09) Next changeset 4:63d45dc9fd01 (2015-12-02) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_cairo_1_12_14 commit b2bcd58af12d07f49a70215fd331eaa0a135d0c8 |
|
modified:
tool_dependencies.xml |
| b |
| diff -r c41942395d25 -r 8294add5c76e tool_dependencies.xml --- a/tool_dependencies.xml Fri Oct 09 07:50:42 2015 -0400 +++ b/tool_dependencies.xml Wed Nov 04 09:51:38 2015 -0500 |
| b |
| @@ -7,7 +7,7 @@ <repository changeset_revision="05df724aefbb" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="freetype" version="2.5.2"> - <repository changeset_revision="289d7796a1f1" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> + <repository changeset_revision="ee307f3ce5dc" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="cairo" version="1.12.14"> <install version="1.0"> @@ -20,18 +20,22 @@ <repository changeset_revision="05df724aefbb" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="libpng" version="1.6.7" /> </repository> - <repository changeset_revision="289d7796a1f1" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> + <repository changeset_revision="ee307f3ce5dc" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="freetype" version="2.5.2" /> </repository> </action> + <!-- edit configure and build/configure.ac.warnings to allow compiling cairo on gcc-4.9. Fixed in more recent versions of cairo --> <action type="shell_command"> - export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" && \ + sed -i.bak 's|MAYBE_WARN="$MAYBE_WARN -flto"|MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" |' configure build/configure.ac.warnings && + 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 \ --enable-xlib-xcb=no \ --enable-xcb=no \ - --enable-xlib-xrender=no + --enable-gtk-doc=no \ + --enable-gtk-doc-html=no \ + --enable-xlib-xrender=no \ </action> <action type="make_install" /> <!-- Create an empty cairo-xlib.h file, because R's configure script explicitly includes it even if X is disabled. --> @@ -45,6 +49,8 @@ <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/include/cairo</environment_variable> <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/include/cairo</environment_variable> <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable> + <environment_variable action="set_to" name="CAIRO_CFLAGS">-I$INSTALL_DIR/include/cairo</environment_variable> + <environment_variable action="set_to" name="CAIRO_LIBS">"-L$INSTALL_DIR/lib -lcairo"</environment_variable> </action> </actions> </install> |