From ae8e50fc36302e43b4071b353d46562de6166112 Mon Sep 17 00:00:00 2001 From: Yavor Georgiev Date: Thu, 25 Jan 2018 13:26:44 +0100 Subject: [PATCH] Reorder Electron OpenSSL dependency (#1636) * Reorder Electron OpenSSL dependency * changelog --- CHANGELOG.md | 1 + binding.gyp | 5 +++++ realm.gypi | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 843cd3a6..88cf481c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ X.Y.Z Release notes ### Bug fixes * [Object Server] Fixed a typing error leading to `_getExistingUser` wasn't defined in the Chrome debugging support library (#1625). +* [Electron] Fixed a `dlopen` error related to OpenSSL that prevented using realm-js on Linux (#1636). ### Internal * None. diff --git a/binding.gyp b/binding.gyp index 19b604bb..4af696c8 100644 --- a/binding.gyp +++ b/binding.gyp @@ -44,6 +44,11 @@ ], "include_dirs": [ "src" + ], + "conditions": [ + ["runtime=='electron'", { + "dependencies": [ "OpenSSL" ] + }] ] }, { diff --git a/realm.gypi b/realm.gypi index 7257fa56..94b8c297 100644 --- a/realm.gypi +++ b/realm.gypi @@ -190,9 +190,6 @@ } }, { "dependencies": [ "vendored-realm" ] - }], - ["runtime=='electron'", { - "dependencies": [ "OpenSSL" ] }] ] }, @@ -226,9 +223,6 @@ } }, { "dependencies": [ "vendored-realm" ] - }], - ["runtime=='electron'", { - "dependencies": [ "OpenSSL" ] }] ], },