d56617e5d0
* chore: avoid appending git version to the exported patches * fix no-eol at end of v8 patch
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
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)
|
|
|
|
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
|
|
index 58f09950d844f4fa4f8d46718852c4f2c490c391..55dd50187714b596e6ded4f2b302fb497af53ad0 100755
|
|
--- a/build/linux/sysroot_scripts/install-sysroot.py
|
|
+++ b/build/linux/sysroot_scripts/install-sysroot.py
|
|
@@ -30,9 +30,11 @@ import sys
|
|
import urllib2
|
|
|
|
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
|
+SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(SCRIPT_DIR)))
|
|
+SYSTOORS_CONFIG_DIR = os.path.join(SRC_DIR, 'electron', 'script')
|
|
|
|
-URL_PREFIX = 'https://commondatastorage.googleapis.com'
|
|
-URL_PATH = 'chrome-linux-sysroot/toolchain'
|
|
+URL_PREFIX = 'http://s3.amazonaws.com'
|
|
+URL_PATH = 'gh-contractor-zcbenz/toolchain'
|
|
|
|
VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
|
|
|
|
@@ -96,7 +98,7 @@ def GetSysrootDict(target_platform, target_arch):
|
|
if target_arch not in VALID_ARCHS:
|
|
raise Error('Unknown architecture: %s' % target_arch)
|
|
|
|
- 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:
|