diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-04-23 11:27:58 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-04-23 12:10:59 +0200 |
| commit | f5f0efe5eb6b76cfe0498835da268c2492f3fe58 (patch) | |
| tree | 55b5f824d756be342d11f93576f973616b1f60e9 /.travis.yml | |
| parent | db12d334cf8129e3b482036fe357b944874a646c (diff) | |
| download | PROJ-f5f0efe5eb6b76cfe0498835da268c2492f3fe58.tar.gz PROJ-f5f0efe5eb6b76cfe0498835da268c2492f3fe58.zip | |
.travis.yml: switch to bionic to restore i386 builds with gcc8 (fixes #2175)
Credits to @sebastic for his suggestion to try bionic and use aptitude
instead of apt !
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 9 insertions, 11 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: |