ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Fix Travis CI build issues 

Add python:i386 to gcc 32-bit builds to avoid a strange dependency
issue with the gcc-4.9 and gcc-7 builds.
Remove chrome workaround since it's not needed anymore.
Change 32-bit clang dependency to gcc-7-multilib (no real reason, I just
feel like doing so).

[skip appveyor]
This commit is contained in:
Jonathan Li 2017-11-30 23:56:11 +00:00
parent a74a5d95ab
commit bc8d9d40bd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
travis.sh
View File

@ -18,18 +18,16 @@ linux_32_before_install() {
if [ "${CXX}" = "clang++" ]; then if [ "${CXX}" = "clang++" ]; then
sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key
sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main" sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main"
# g++-4.9-multilib is necessary for compiler dependencies. 4.8 currently # g++-x-multilib is necessary for compiler dependencies.
# has dependency issues, but 4.9 from the toolchain repo seems to work COMPILER_PACKAGE="clang-${VERSION} g++-7-multilib clang-format-${VERSION}"
# fine, so let's just use that.
COMPILER_PACKAGE="clang-${VERSION} g++-4.9-multilib clang-format-${VERSION}"
fi fi
if [ "${CXX}" = "g++" ]; then if [ "${CXX}" = "g++" ]; then
COMPILER_PACKAGE="g++-${VERSION}-multilib" # python:i386 is required to avoid dependency issues for gcc-4.9 and
# gcc-7. It causes issues with clang-format though, so the dependency is
# only specified for gcc.
COMPILER_PACKAGE="g++-${VERSION}-multilib python:i386"
fi fi
# apt-get update fails because Chrome is 64-bit only.
sudo rm -f /etc/apt/sources.list.d/google-chrome.list
sudo apt-get -qq update sudo apt-get -qq update
# The 64-bit versions of the first 7 dependencies are part of the initial # The 64-bit versions of the first 7 dependencies are part of the initial