Skip to content

Commit

Permalink
install newer libseccomp on Travis host for building with Qt 5.10+ in…
Browse files Browse the repository at this point in the history
… Docker container
  • Loading branch information
3nids committed May 29, 2019
1 parent bc65d25 commit a871e90
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .ci/travis/docker_image/before_install.sh
Expand Up @@ -14,3 +14,11 @@
# #
###########################################################################

if [[ ${INSTALL_LIBSECCOMP} =~ ^TRUE$ ]]; then
# When building QGIS with Qt 5.10+ in a Docker container, statx calls are required on the host
# see https://bugs.launchpad.net/ubuntu/+source/docker.io/+bug/1755250
# this is required on Xenial (currently most recent distribution on Travis), but sould not on Bionic+
wget https://launchpad.net/ubuntu/+archive/primary/+files/libseccomp2_2.4.1-0ubuntu0.16.04.2_amd64.deb
sudo dpkg -i libseccomp2_2.4.1-0ubuntu0.16.04.2_amd64.deb
sudo apt-get install -f
fi
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -125,6 +125,7 @@ matrix:
- TRIGGER_PYQGIS_DOC=TRUE
- DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_disco"
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-disco.dockerfile
- INSTALL_LIBSECCOMP=TRUE



Expand Down

0 comments on commit a871e90

Please sign in to comment.