mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10148 from electron/fix-arm-deps

Browse source 
Fix conflicting dependencies for building arm
This commit is contained in:
Cheng Zhao 2017-07-31 11:16:20 +09:00 committed by GitHub
commit e10ebfa7f3
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
script/cibuild
View file

@ -18,14 +18,20 @@ LINUX_DEPS = [
'libnotify-dev', 'libnotify-dev',
'libnss3-dev', 'libnss3-dev',
'libxtst-dev', 'libxtst-dev',
]
LINUX_DEPS_NO_ARM = [
'gcc-multilib', 'gcc-multilib',
'g++-multilib', 'g++-multilib',
] ]
LINUX_DEPS_ARM = [ LINUX_DEPS_ARM = [
'binutils-aarch64-linux-gnu',
'libc6-dev-armhf-cross', 'libc6-dev-armhf-cross',
'linux-libc-dev-armhf-cross', 'linux-libc-dev-armhf-cross',
'g++-arm-linux-gnueabihf', 'g++-arm-linux-gnueabihf',
'g++-4.8-multilib-arm-linux-gnueabihf',
'gcc-4.8-multilib-arm-linux-gnueabihf',
] ]
@ -53,6 +59,8 @@ def main():
deps = LINUX_DEPS deps = LINUX_DEPS
if target_arch == 'arm': if target_arch == 'arm':
deps += LINUX_DEPS_ARM deps += LINUX_DEPS_ARM
else:
deps += LINUX_DEPS_NO_ARM
execute(['sudo', 'apt-get', 'install'] + deps) execute(['sudo', 'apt-get', 'install'] + deps)
execute(['sh', '-e', '/etc/init.d/xvfb', 'start']) execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])