mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-02 07:57:43 +00:00
package/benejson: build using host-python3
Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
52f7673f0d
commit
cca9156949
@ -0,0 +1,31 @@
|
|||||||
|
Use print as a function in SConstruct build file for Py3 compatibility.
|
||||||
|
This allow to run SCons on Python 3
|
||||||
|
|
||||||
|
[Upstream status: https://github.com/codehero/benejson/pull/12]
|
||||||
|
|
||||||
|
Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||||
|
---
|
||||||
|
benejson/SConscript | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/benejson/SConscript b/benejson/SConscript
|
||||||
|
index b7c5d10..80b4875 100644
|
||||||
|
--- a/benejson/SConscript
|
||||||
|
+++ b/benejson/SConscript
|
||||||
|
@@ -9,11 +9,11 @@ lib_env = lib_env.Clone()
|
||||||
|
conf = Configure(lib_env)
|
||||||
|
|
||||||
|
if not conf.CheckFunc("stpcpy"):
|
||||||
|
- print "Did not find stpcpy(), using bnj local version"
|
||||||
|
+ print("Did not find stpcpy(), using bnj local version")
|
||||||
|
conf.env.Append(CPPDEFINES = ["-Dstpcpy=bnj_local_stpcpy"])
|
||||||
|
|
||||||
|
if not conf.CheckFunc("stpncpy"):
|
||||||
|
- print "Did not find stpncpy(), using bnj local version"
|
||||||
|
+ print("Did not find stpncpy(), using bnj local version")
|
||||||
|
conf.env.Append(CPPDEFINES = ["-Dstpncpy=bnj_local_stpncpy"])
|
||||||
|
lib_env = conf.Finish()
|
||||||
|
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -9,7 +9,7 @@ BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION))
|
|||||||
BENEJSON_LICENSE = MIT
|
BENEJSON_LICENSE = MIT
|
||||||
BENEJSON_LICENSE_FILES = LICENSE
|
BENEJSON_LICENSE_FILES = LICENSE
|
||||||
BENEJSON_INSTALL_STAGING = YES
|
BENEJSON_INSTALL_STAGING = YES
|
||||||
BENEJSON_DEPENDENCIES = host-python host-scons
|
BENEJSON_DEPENDENCIES = host-python3 host-scons
|
||||||
|
|
||||||
# wchar support needs to be manually disabled
|
# wchar support needs to be manually disabled
|
||||||
ifeq ($(BR2_USE_WCHAR),)
|
ifeq ($(BR2_USE_WCHAR),)
|
||||||
@ -41,7 +41,7 @@ endif # Shared enabled
|
|||||||
define BENEJSON_BUILD_CMDS
|
define BENEJSON_BUILD_CMDS
|
||||||
(cd $(@D); \
|
(cd $(@D); \
|
||||||
$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
|
$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
|
||||||
$(HOST_DIR)/bin/python2 $(SCONS) $(BENEJSON_SCONS_TARGETS))
|
$(HOST_DIR)/bin/python3 $(SCONS) $(BENEJSON_SCONS_TARGETS))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define BENEJSON_INSTALL_STAGING_CMDS
|
define BENEJSON_INSTALL_STAGING_CMDS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user