From 91706114288ccbdff3fb5b426b810ab2f7a0ef43 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 19 Aug 2019 20:16:19 +1000 Subject: [PATCH 1/2] Travis: Use Xenial for build coverage --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aff5bf2..c427f49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: cpp +dist: trusty sudo: false install: script: @@ -7,9 +8,9 @@ script: - make dist-src - make clean && SYSTEM=linux make - make clean && SYSTEM=linux-osmesa make -#- make clean && SYSTEM=linux-egl make +- make clean && SYSTEM=linux-egl make - make clean && SYSTEM=linux-clang make -#- make clean && SYSTEM=linux-clang-egl make +- make clean && SYSTEM=linux-clang-egl make - pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' . && make && popd - pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . && make && popd #- pushd build/cmake && git clean -xdf . && cmake -G 'Unix Makefiles' -DGLEW_EGL=1 . && make && popd @@ -20,7 +21,7 @@ addons: - cmake - dos2unix - libosmesa6-dev -# - libegl1-mesa-dev + - libegl1-mesa-dev artifacts: paths: - $(ls *.zip *.tgz | tr "\n" ":") From ea30c83d92044d5291f6e669ecdd2dfc8dbfd1d8 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 19 Aug 2019 22:30:12 +1000 Subject: [PATCH 2/2] linux-clang: -std=c89 rather than -ansi --- config/Makefile.linux-clang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Makefile.linux-clang b/config/Makefile.linux-clang index 2992b89..75a43f8 100644 --- a/config/Makefile.linux-clang +++ b/config/Makefile.linux-clang @@ -24,7 +24,7 @@ WARN = -Wall -W POPT = -O2 CFLAGS.EXTRA += -fPIC CFLAGS.EXTRA += -Wcast-qual -CFLAGS.EXTRA += -ansi -pedantic +CFLAGS.EXTRA += -std=c89 -pedantic CFLAGS.EXTRA += -fno-stack-protector BIN.SUFFIX = LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)