# HG changeset patch # User Chris Cannam # Date 1535712902 -3600 # Node ID be5496ec5f9792de0bb88cf7065be9181468880c # Parent 7496836f8f2797159eaf7c95b6ac4ffebd9f6d63 Add missed ppa; try setting CC/CXX directly diff -r 7496836f8f27 -r be5496ec5f97 .travis.yml --- a/.travis.yml Fri Aug 31 11:45:51 2018 +0100 +++ b/.travis.yml Fri Aug 31 11:55:02 2018 +0100 @@ -15,8 +15,8 @@ packages: - libbz2-dev libfftw3-dev libfishsound1-dev libid3tag0-dev liblo-dev liblrdf0-dev libmad0-dev liboggz2-dev libpulse-dev libsamplerate-dev libsndfile-dev libsord-dev libxml2-utils portaudio19-dev qt5-default libqt5svg5-dev raptor-utils librubberband-dev autoconf libtool git mlton g++-4.9 env: - - MATRIX_CC=gcc-4.9 - - MATRIX_CXX=g++-4.9 + - CC=gcc-4.9 + - CXX=g++-4.9 before_install: - if [[ "$TRAVIS_OS_NAME" = "osx" ]] ; then brew update ; fi diff -r 7496836f8f27 -r be5496ec5f97 deploy/linux/docker/Dockerfile_appimage.in --- a/deploy/linux/docker/Dockerfile_appimage.in Fri Aug 31 11:45:51 2018 +0100 +++ b/deploy/linux/docker/Dockerfile_appimage.in Fri Aug 31 11:55:02 2018 +0100 @@ -40,6 +40,7 @@ # actually linking against it. We also have Pulse as the default I/O. RUN apt-add-repository -y ppa:beineri/opt-qt-5.10.1-trusty +RUN apt-add-repository -y ppa:ubuntu-toolchain-r/test RUN apt-get update && \ apt-get install -y \ g++-4.9 \