]>
Commit | Line | Data |
---|---|---|
109876d2 JP |
1 | --- domoticz-2021.1/hardware/plugins/DelayedLink.h.orig 2021-04-17 17:50:55.000000000 +0200 |
2 | +++ domoticz-2021.1/hardware/plugins/DelayedLink.h 2021-04-20 12:36:46.238826640 +0200 | |
3 | @@ -155,20 +155,10 @@ | |
9dda6696 AM |
4 | if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll"); |
5 | if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll"); | |
6 | # else | |
9a71e0cb | 7 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll"); |
86ad2462 | 8 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll"); |
9dda6696 AM |
9 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll"); |
10 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll"); | |
11 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll"); | |
12 | - if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll"); | |
86ad2462 | 13 | + if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll"); |
9dda6696 AM |
14 | # endif |
15 | #else | |
9a71e0cb | 16 | - if (!shared_lib_) FindLibrary("python3.9", true); |
86ad2462 | 17 | - if (!shared_lib_) FindLibrary("python3.8", true); |
9dda6696 AM |
18 | - if (!shared_lib_) FindLibrary("python3.7", true); |
19 | - if (!shared_lib_) FindLibrary("python3.6", true); | |
20 | - if (!shared_lib_) FindLibrary("python3.5", true); | |
21 | - if (!shared_lib_) FindLibrary("python3.4", true); | |
109876d2 | 22 | + if (!shared_lib_) FindLibrary(PYTHON_LIBDIR, false); |
10f7a92e AM |
23 | #ifdef __FreeBSD__ |
24 | if (!shared_lib_) FindLibrary("python3.7m", true); | |
25 | if (!shared_lib_) FindLibrary("python3.6m", true); | |
109876d2 JP |
26 | @@ -355,34 +327,20 @@ |
27 | else | |
28 | { | |
29 | std::vector<std::string> entries; | |
30 | - DirectoryListing(entries, sLibrary, true, false); | |
31 | - for (const auto &entry : entries) | |
9dda6696 | 32 | - { |
109876d2 JP |
33 | - if (shared_lib_) |
34 | - { | |
35 | - break; | |
36 | - } | |
37 | - | |
38 | - library = sLibrary + entry + "/"; | |
9dda6696 AM |
39 | - FindLibrary(library, false); |
40 | - } | |
109876d2 JP |
41 | - |
42 | - entries.clear(); | |
43 | DirectoryListing(entries, sLibrary, false, true); | |
44 | for (const auto &filename : entries) | |
9dda6696 | 45 | { |
109876d2 JP |
46 | - if (shared_lib_) |
47 | - { | |
48 | - break; | |
49 | - } | |
9dda6696 | 50 | |
109876d2 JP |
51 | if (filename.length() > 12 && |
52 | filename.compare(0, 11, "libpython3.") == 0 && | |
53 | - filename.compare(filename.length() - 3, 3, ".so") == 0 && | |
54 | - filename.compare(filename.length() - 6, 6, ".dylib") == 0) | |
55 | + filename.find(".so", 10) != std::string::npos) | |
56 | { | |
57 | - library = sLibrary + filename; | |
58 | + library = sLibrary + "/" + filename; | |
59 | shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); | |
60 | + if (shared_lib_) | |
61 | + { | |
62 | + break; | |
63 | + } | |
64 | } | |
9dda6696 | 65 | } |
109876d2 | 66 | } |