-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
31 additions
and
106 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001 | ||
From: Matt Gajownik <matt@obsproject.com> | ||
Date: Tue, 25 Aug 2020 19:28:26 +1000 | ||
Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix | ||
Fixes #2222 | ||
--- | ||
libobs/util/platform-nix.c | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c | ||
index 26800d52f7..997b62db1a 100644 | ||
--- a/libobs/util/platform-nix.c | ||
+++ b/libobs/util/platform-nix.c | ||
@@ -71,7 +71,8 @@ void *os_dlopen(const char *path) | ||
#ifdef __APPLE__ | ||
void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST); | ||
#else | ||
- void *res = dlopen(dylib_name.array, RTLD_LAZY); | ||
+ void *res = dlopen(dylib_name.array, | ||
+ RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL); | ||
#endif | ||
if (!res) | ||
blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path, |
File renamed without changes.