d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot to 2020.11-rc2 (#995)

Browse Source 
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner
2020-11-16 11:06:25 +01:00
committed by GitHub
parent a0871be6c0
commit 80f02b8ab6
135 changed files with 2059 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
buildroot/package/domoticz/0004-Load-python-3-9-shared-libs.patch Normal file
View File

@@ -0,0 +1,41 @@
From 4e1d21967d27d286cbc837b98a1a9f031f7dde58 Mon Sep 17 00:00:00 2001
From: Jose Zapater <jzapater@gmail.com>
Date: Fri, 6 Nov 2020 07:40:37 +0100
Subject: [PATCH] Load python 3.9 shared libs
Signed-off-by: Jose Zapater <jzapater@gmail.com>
[Retrieved from:
https://github.com/domoticz/domoticz/commit/4e1d21967d27d286cbc837b98a1a9f031f7dde58]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
hardware/plugins/DelayedLink.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h
index cb71478685..409c9dce1b 100644
--- a/hardware/plugins/DelayedLink.h
+++ b/hardware/plugins/DelayedLink.h
@@ -193,12 +193,14 @@ namespace Plugins {
if (!shared_lib_) {
#ifdef WIN32
# ifdef _DEBUG
+ if (!shared_lib_) shared_lib_ = LoadLibrary("python39_d.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python38_d.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python37_d.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python36_d.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
# else
+ if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
@@ -206,6 +208,7 @@ namespace Plugins {
if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
# endif
#else
+ if (!shared_lib_) FindLibrary("python3.9", true);
if (!shared_lib_) FindLibrary("python3.8", true);
if (!shared_lib_) FindLibrary("python3.7", true);
if (!shared_lib_) FindLibrary("python3.6", true);