2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
|
|
|
Date: Thu, 18 Oct 2018 17:03:57 -0700
|
|
|
|
|
Subject: sysroot.patch
|
|
|
|
|
|
|
|
|
|
Make chrome's install-sysroot scripts point to our custom sysroot builds,
|
|
|
|
|
which include extra deps that Electron needs (e.g. libnotify)
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
|
2020-10-02 20:25:30 +00:00
|
|
|
index f8b7906cc557fb196e19dd6684a29c174b56c789..351b3a658b6b6d1dbe2370e825058b8b6dcbf9df 100755
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/build/linux/sysroot_scripts/install-sysroot.py
|
|
|
|
|
+++ b/build/linux/sysroot_scripts/install-sysroot.py
|
2019-08-15 20:50:58 +00:00
|
|
|
@@ -37,9 +37,11 @@ except ImportError:
|
|
|
|
|
from urllib2 import urlopen
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
2018-10-24 18:24:11 +00:00
|
|
|
+SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(SCRIPT_DIR)))
|
|
|
|
|
+SYSTOORS_CONFIG_DIR = os.path.join(SRC_DIR, 'electron', 'script')
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
-URL_PREFIX = 'https://commondatastorage.googleapis.com'
|
|
|
|
|
-URL_PATH = 'chrome-linux-sysroot/toolchain'
|
2020-10-02 20:25:30 +00:00
|
|
|
+URL_PREFIX = 'https://s3.amazonaws.com'
|
2019-10-30 00:50:24 +00:00
|
|
|
+URL_PATH = 'electronjs-sysroots/toolchain'
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
|
|
|
|
|
|
2020-05-26 20:06:26 +00:00
|
|
|
@@ -101,7 +103,7 @@ def GetSysrootDict(target_platform, target_arch):
|
2018-09-22 20:31:43 +00:00
|
|
|
if target_arch not in VALID_ARCHS:
|
|
|
|
|
raise Error('Unknown architecture: %s' % target_arch)
|
2018-09-14 05:02:16 +00:00
|
|
|
|
2018-09-22 20:31:43 +00:00
|
|
|
- sysroots_file = os.path.join(SCRIPT_DIR, 'sysroots.json')
|
|
|
|
|
+ sysroots_file = os.path.join(SYSTOORS_CONFIG_DIR, 'sysroots.json')
|
|
|
|
|
sysroots = json.load(open(sysroots_file))
|
|
|
|
|
sysroot_key = '%s_%s' % (target_platform, target_arch)
|
|
|
|
|
if sysroot_key not in sysroots:
|
