1 From f7b229ce873ff71e2b48e855075153dc1026750d Mon Sep 17 00:00:00 2001
2 From: Michael Cronenworth <mike@cchtml.com>
3 Date: Mon, 7 Aug 2017 14:37:28 -0500
4 Subject: [PATCH] Follow PEP-384 when finding and opening python3 library
6 Instead of maintaining a list of all Python versions the Python 3
7 standard defines that there MUST be a stable ABI and we can always
8 rely on a "python3.dll" or a "libpython3.so" existing.
10 This also fixes library loading on Linux distributions that use
11 SO versioned libraries.
13 hardware/plugins/DelayedLink.h | 28 ++--------------------------
14 1 file changed, 2 insertions(+), 26 deletions(-)
16 diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h
17 index 25c83f034..ecf19da09 100644
18 --- a/hardware/plugins/DelayedLink.h
19 +++ b/hardware/plugins/DelayedLink.h
21 if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
22 if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
24 - if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll");
25 - if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll");
26 - if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
27 - if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
28 - if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
29 - if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
30 + if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
33 - if (!shared_lib_) FindLibrary("python3.9", true);
34 - if (!shared_lib_) FindLibrary("python3.8", true);
35 - if (!shared_lib_) FindLibrary("python3.7", true);
36 - if (!shared_lib_) FindLibrary("python3.6", true);
37 - if (!shared_lib_) FindLibrary("python3.5", true);
38 - if (!shared_lib_) FindLibrary("python3.4", true);
39 + if (!shared_lib_) FindLibrary("python3", true);
41 if (!shared_lib_) FindLibrary("python3.7m", true);
42 if (!shared_lib_) FindLibrary("python3.6m", true);
44 library = "lib" + sLibrary + ".so";
45 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
47 - // look in directories covered by ldconfig but 'm' variant
50 - library = "lib" + sLibrary + "m.so";
51 - shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
53 // look in /usr/lib directories
56 library = "/usr/lib/" + sLibrary + "/";
57 FindLibrary(library, false);
59 - // look in /usr/lib directories but 'm' variant
62 - library = "/usr/lib/" + sLibrary + "m/";
63 - FindLibrary(library, false);
65 // look in /usr/local/lib directory (handles build from source)
69 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
72 - // look in /usr/local/lib directory (handles build from source) but 'm' variant
75 - library = "/usr/local/lib/lib" + sLibrary + "m.so";
76 - shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
79 // look for .dylib in /usr/local/lib