github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-26 07:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent a7035b08d5 7d8f62293f
commit e10ebfa7f3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
script/cibuild
View File

@@ -18,14 +18,20 @@ LINUX_DEPS = [
'libnotify-dev',
'libnss3-dev',
'libxtst-dev',
]
LINUX_DEPS_NO_ARM = [
'gcc-multilib',
'g++-multilib',
]
LINUX_DEPS_ARM = [
'libc6-dev-armhf-cross',
'linux-libc-dev-armhf-cross',
'g++-arm-linux-gnueabihf',
'binutils-aarch64-linux-gnu',
'libc6-dev-armhf-cross',
'linux-libc-dev-armhf-cross',
'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
if target_arch == 'arm':
deps += LINUX_DEPS_ARM
else:
deps += LINUX_DEPS_NO_ARM
execute(['sudo', 'apt-get', 'install'] + deps)
execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])