diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-04-23 00:49:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 00:49:52 +0200 |
| commit | 974b0dbf595857c8e630c478d9f0a97b29578485 (patch) | |
| tree | 60794dca3b346916846b9740c3dfa343d6fa75ea | |
| parent | 9308c4d27e703eb021c48d6ccde083b14bd7d045 (diff) | |
| parent | a38ee5b6bdcff7cac34dc3607761ad02f5389c23 (diff) | |
| download | PROJ-974b0dbf595857c8e630c478d9f0a97b29578485.tar.gz PROJ-974b0dbf595857c8e630c478d9f0a97b29578485.zip | |
Merge pull request #2180 from PROJ-BOT/backport-2179-to-7.0
[Backport 7.0] .travis.yml: give-up with i386 builds on linux_gcc8 (refs #2175)
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 727db512..c7e6631b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,16 +36,19 @@ matrix: - docker env: - BUILD_NAME=linux_gcc8 - - DETAILS="linux, gcc8, i386" - - ARCH=i386 + - DETAILS="linux, gcc8" + - ARCH=amd64 +# - DETAILS="linux, gcc8, i386" +# - ARCH=i386 - CC=gcc-8 - CXX=g++-8 - - 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 -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" addons: apt: sources: |