Mercurial > hg > sonic-visualiser
changeset 1972:be5496ec5f97 c++14
Add missed ppa; try setting CC/CXX directly
| author | Chris Cannam |
|---|---|
| date | Fri, 31 Aug 2018 11:55:02 +0100 |
| parents | 7496836f8f27 |
| children | b7af36ebafe0 |
| files | .travis.yml deploy/linux/docker/Dockerfile_appimage.in |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 \