From 47ed9aa1b9b29879f8c21df28d5615fccc15e426 Mon Sep 17 00:00:00 2001 From: scribam Date: Wed, 23 Aug 2017 13:29:13 +0200 Subject: [PATCH] .travis.yml: rework binutils package update --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33b7d560c0..9ac1c8de27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,13 +51,6 @@ before_install: brew update; brew update; brew install ccache glew llvm40; fi; - # We need to update binutils to a newer version to link against the ffmpeg libs on. - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - sudo add-apt-repository ppa:jonathonf/binutils -y ; - sudo apt-get update ; - sudo apt-get install binutils -y; - ld --version ; - fi; before_script: - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers @@ -104,7 +97,9 @@ addons: sources: - ubuntu-toolchain-r-test - llvm-toolchain-trusty-4.0 + - sourceline: 'ppa:jonathonf/binutils' # We need to update binutils to a newer version to link against the ffmpeg libs on. packages: + - binutils - cmake - libasound2-dev - libopenal-dev