domoticz-python.patch

   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
   5
   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.
   9
  10 This also fixes library loading on Linux distributions that use
  11 SO versioned libraries.
  12 ---
  13  hardware/plugins/DelayedLink.h | 28 ++--------------------------
  14  1 file changed, 2 insertions(+), 26 deletions(-)
  15
  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
  20 @@ -150,18 +150,10 @@
  21                                 if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
  22                                 if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
  23  #      else
  24 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll");
  25 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
  26 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
  27 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
  28 -                               if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
  29 +                               if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
  30  #      endif
  31  #else
  32 -                               if (!shared_lib_) FindLibrary("python3.8", true);
  33 -                               if (!shared_lib_) FindLibrary("python3.7", true);
  34 -                               if (!shared_lib_) FindLibrary("python3.6", true);
  35 -                               if (!shared_lib_) FindLibrary("python3.5", true);
  36 -                               if (!shared_lib_) FindLibrary("python3.4", true);
  37 +                               if (!shared_lib_) FindLibrary("python3", true);
  38  #ifdef __FreeBSD__
  39                                 if (!shared_lib_) FindLibrary("python3.7m", true);
  40                                 if (!shared_lib_) FindLibrary("python3.6m", true);
  41 @@ -271,24 +263,12 @@
  42                                                 library = "lib" + sLibrary + ".so";
  43                                                 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  44                                         }
  45 -                                       // look in directories covered by ldconfig but 'm' variant
  46 -                                       if (!shared_lib_)
  47 -                                       {
  48 -                                               library = "lib" + sLibrary + "m.so";
  49 -                                               shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  50 -                                       }
  51                                         // look in /usr/lib directories
  52                                         if (!shared_lib_)
  53                                         {
  54                                                 library = "/usr/lib/" + sLibrary + "/";
  55                                                 FindLibrary(library, false);
  56                                         }
  57 -                                       // look in /usr/lib directories but 'm' variant
  58 -                                       if (!shared_lib_)
  59 -                                       {
  60 -                                               library = "/usr/lib/" + sLibrary + "m/";
  61 -                                               FindLibrary(library, false);
  62 -                                       }
  63                                         // look in /usr/local/lib directory (handles build from source)
  64                                         if (!shared_lib_)
  65                                         {
  66 @@ -296,12 +276,6 @@
  67                                                 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  68
  69                                         }
  70 -                                       // look in /usr/local/lib directory (handles build from source) but 'm' variant
  71 -                                       if (!shared_lib_)
  72 -                                       {
  73 -                                               library = "/usr/local/lib/lib" + sLibrary + "m.so";
  74 -                                               shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  75 -                                       }
  76                                         // MacOS
  77                                         // look for .dylib in /usr/local/lib
  78                                         if (!shared_lib_)