diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-09 12:41:30 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-09 16:21:46 -0800 |
| commit | bee160a9e2f4c94e2d5e777f26bcb39bffbb9c74 (patch) | |
| tree | df38fea22c38828c2eb4416e7f22cfbc1b6d4c2f | |
| parent | b425d5641d77e934d74b29a4e1abf2a83922fb93 (diff) | |
| download | subsurface-bee160a9e2f4c94e2d5e777f26bcb39bffbb9c74.tar.gz | |
Travis: work around the way build.sh looks for private headers
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | scripts/linux/before_install.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/linux/before_install.sh b/scripts/linux/before_install.sh index 593e1c128..58f40c760 100644 --- a/scripts/linux/before_install.sh +++ b/scripts/linux/before_install.sh @@ -6,12 +6,16 @@ # this is built from the latest version as of 2017-11-09 in the 5.9 branch and # therefore calls itself Qt-5.9.3 +set -x + export QT_ROOT=$PWD/Qt/5.9.3 rm -rf Qt mkdir -p $QT_ROOT wget http://subsurface-divelog.org/downloads/Qt-5.9.3-trusty.tar.xz tar -xJ -C $QT_ROOT -f Qt-5.9.3-trusty.tar.xz +sudo ln -s $QT_ROOT /usr/local/Qt-5.9.3 + # TestPreferences uses gui calls, so run a xvfb so it has something to talk to export DISPLAY=:99.0 sh -e /etc/init.d/xvfb start |