diff options
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rwxr-xr-x | travis/linux_gcc8/before_install.sh | 3 |
2 files changed, 11 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index c7e6631b..d62d104f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,25 +30,23 @@ matrix: - g++-4.8 - os: linux - dist: xenial + dist: bionic compiler: gcc services: - docker env: - BUILD_NAME=linux_gcc8 - DETAILS="linux, gcc8" - - ARCH=amd64 -# - DETAILS="linux, gcc8, i386" -# - ARCH=i386 + - DETAILS="linux, gcc8, i386" + - ARCH=i386 - CC=gcc-8 - CXX=g++-8 - - CXXFLAGS='-g -O2 -D_GLIBCXX_ASSERTIONS' -# - CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS' -# - CFLAGS='-g -O2 -m32' -# - TIFF_CFLAGS=-I/usr/include/i386-linux-gnu -# - TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff" -# - SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu -# - SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3" + - CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS' + - CFLAGS='-g -O2 -m32' + - TIFF_CFLAGS=-I/usr/include/i386-linux-gnu + - TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff" + - SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu + - SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3" addons: apt: sources: diff --git a/travis/linux_gcc8/before_install.sh b/travis/linux_gcc8/before_install.sh index 424bc10e..ff6c0927 100755 --- a/travis/linux_gcc8/before_install.sh +++ b/travis/linux_gcc8/before_install.sh @@ -5,7 +5,8 @@ set -e ./travis/before_install_apt.sh ./travis/before_install_pip.sh -sudo apt-get install -qq \ +sudo aptitude remove -q -y libtiff-dev libcurl4-gnutls-dev +sudo aptitude install -q -y \ lcov \ doxygen graphviz \ sqlite3 libsqlite3-dev:$ARCH \ |