summarylogtreecommitdiffstats
path: root/systemLibraries.patch
diff options
context:
space:
mode:
authorJames P. Harvey2019-08-20 07:57:43 -0400
committerJames P. Harvey2019-08-20 07:57:43 -0400
commitb88f551d9fe07b552ba58de349232a6ff9698e1e (patch)
treeeeb30aaceb8dae782c456689106b0272b63b784f /systemLibraries.patch
parentc7d4e298df9deea793ea44e78a45cbc7a3bf0cb8 (diff)
downloadaur-b88f551d9fe07b552ba58de349232a6ff9698e1e.tar.gz
Add upstream patch to fix 4.2.0 build failure using system libraries.
Diffstat (limited to 'systemLibraries.patch')
-rw-r--r--systemLibraries.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/systemLibraries.patch b/systemLibraries.patch
new file mode 100644
index 000000000000..315ef70f2332
--- /dev/null
+++ b/systemLibraries.patch
@@ -0,0 +1,15 @@
+diff --git a/src/third_party/SConscript b/src/third_party/SConscript
+index 5c0c129b30..6531300fee 100644
+--- a/src/third_party/SConscript
++++ b/src/third_party/SConscript
+@@ -206,7 +206,9 @@ def injectThirdParty(thisEnv, libraries=[], parts=[]):
+ libraries = thisEnv.Flatten([libraries])
+ parts = thisEnv.Flatten([parts])
+ for lib in libraries:
+- mods = thirdPartyEnvironmentModifications[lib]
++ mods = thirdPartyEnvironmentModifications.get(lib, None)
++ if not mods:
++ continue
+ if not parts:
+ thisEnv.PrependUnique(**mods)
+ else: