From 69589afff71c04bf339ef40d47bf90b204957f74 Mon Sep 17 00:00:00 2001
From: Michael Bonfils <murlock42@gmail.com>
Date: Tue, 6 Mar 2018 20:37:58 +0100
Subject: [PATCH] Fix travis for Linux build

Several issues was detected with linux build:
- travis_wait raise timeout
- --jobs=2 sometimes fails
- add flag BOOST_NO_CXX11_SCOPED_ENUMS to fix compilation with old boost filesystme
- add missing tool xmllint
---
 .travis-install-deps.sh | 2 +-
 .travis.yml             | 2 +-
 SConstruct              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis-install-deps.sh b/.travis-install-deps.sh
index f159027c..3eecdf30 100755
--- a/.travis-install-deps.sh
+++ b/.travis-install-deps.sh
@@ -7,5 +7,5 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 	brew install scons sfml
 else
 	sudo apt-get update -qq
-	sudo apt-get install -qq libsfml-dev libboost-dev libboost-filesystem-dev libboost-thread-dev
+	sudo apt-get install -qq libsfml-dev libboost-dev libboost-filesystem-dev libboost-thread-dev libxml2-utils
 fi
diff --git a/.travis.yml b/.travis.yml
index 4bf8320a..5e7c106e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: cpp
 sudo: required
 services: ['docker']
 
-script: travis_wait scons --jobs=2
+script: CXXFLAGS=-DBOOST_NO_CXX11_SCOPED_ENUMS scons
 
 compiler:
  - clang
diff --git a/SConstruct b/SConstruct
index aa378311..e03d8505 100644
--- a/SConstruct
+++ b/SConstruct
@@ -25,6 +25,9 @@ else:
 env.VariantDir('#build/obj', 'src')
 env.VariantDir('#build/obj/test', 'test')
 
+# Allow arbitrary flags
+env.Append(CXXFLAGS=os.environ.get('CXXFLAGS', ''))
+
 debug = ARGUMENTS.get('debug', 0)
 if int(debug):
    env.Append(CCFLAGS = '-g')