| Previous changeset 1:8673ff1d430b (2015-10-08) Next changeset 3:8294add5c76e (2015-11-04) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_cairo_1_12_14 commit e6f0b88b7a59f0a10827fd55436b137b13cd1921 |
|
modified:
tool_dependencies.xml |
| b |
| diff -r 8673ff1d430b -r c41942395d25 tool_dependencies.xml --- a/tool_dependencies.xml Thu Oct 08 10:23:03 2015 -0400 +++ b/tool_dependencies.xml Fri Oct 09 07:50:42 2015 -0400 |
| b |
| @@ -24,17 +24,14 @@ <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"> - 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-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. --> |