From 96d7e6ddcb75e37cc2fdf8009be1fe7769027cb1 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 21 Jun 2015 01:14:24 +0200 Subject: .travis.yml: attempt to fix coveralls with libtool --- .travis.yml | 3 +-- libtool | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 860dd47f..2aa13779 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,8 +53,7 @@ install: # autoconf build with grids and coverage - CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure - make -j3 - - cd src/.libs - - for i in ../*.c; do ln -s $i .; done + - mv src/.libs/*.gc* src - cd ../.. - make check diff --git a/libtool b/libtool index 73cb2748..0e0f5516 100755 --- a/libtool +++ b/libtool @@ -2,7 +2,7 @@ # libtool - Provide generalized library-building support services. # Generated automatically by config.status (proj) 4.9.1 -# Libtool was configured on host vagrant-ubuntu-trusty-32: +# Libtool was configured on host even-desktop: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -66,12 +66,12 @@ PATH_SEPARATOR=":" # The host system. host_alias= -host=i686-pc-linux-gnu +host=x86_64-unknown-linux-gnu host_os=linux-gnu # The build system. build_alias= -build=i686-pc-linux-gnu +build=x86_64-unknown-linux-gnu build_os=linux-gnu # A sed program that does not truncate output. @@ -164,7 +164,7 @@ lock_old_archive_extraction=no LTCC="gcc" # LTCC compiler flags. -LTCFLAGS="-g -O2" +LTCFLAGS="--coverage" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" @@ -272,10 +272,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/i686-linux-gnu/4.8 /usr/lib/i386-linux-gnu /usr/lib /lib/i386-linux-gnu /lib " +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.4.3 /usr/lib /lib /usr/lib/x86_64-linux-gnu " # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/i386-linux-gnu/libfakeroot /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib " +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/fglrx /usr/lib32/fglrx /usr/lib/atlas /usr/lib32/alsa-lib /usr/lib/alsa-lib /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu " # Whether dlopen is supported. dlopen_support=unknown @@ -292,7 +292,7 @@ striplib="strip --strip-unneeded" # The linker used to build libraries. -LD="/usr/bin/ld" +LD="/usr/bin/ld -m elf_x86_64" # How to create reloadable object files. reload_flag=" -r" -- cgit v1.2.3