jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/pkg-waf: use host-python3

Browse Source 
This is the last of an unconsolidated series of patches that
removes the need for host-python(2) for all waf-based packages.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Titouan Christophe 2020-02-04 22:59:50 +01:00 committed by Yann E. MORIN
parent 9a366a15fd
commit 3d070040ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/pkg-waf.mk
View File

@ -36,8 +36,8 @@
define inner-waf-package define inner-waf-package
# We need host-python to run waf # We need host-python3 to run waf
$(2)_DEPENDENCIES += host-python $(2)_DEPENDENCIES += host-python3
$(2)_NEEDS_EXTERNAL_WAF ?= NO $(2)_NEEDS_EXTERNAL_WAF ?= NO
@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS
cd $$($$(PKG)_SRCDIR) && \ cd $$($$(PKG)_SRCDIR) && \
$$(TARGET_CONFIGURE_OPTS) \ $$(TARGET_CONFIGURE_OPTS) \
$$($(2)_CONF_ENV) \ $$($(2)_CONF_ENV) \
$$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \ $$(HOST_DIR)/bin/python3 $$($(2)_WAF) configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib \ --libdir=/usr/lib \
$$($(2)_CONF_OPTS) \ $$($(2)_CONF_OPTS) \
@ -78,7 +78,7 @@ endif
ifndef $(2)_BUILD_CMDS ifndef $(2)_BUILD_CMDS
define $(2)_BUILD_CMDS define $(2)_BUILD_CMDS
cd $$($$(PKG)_SRCDIR) && \ cd $$($$(PKG)_SRCDIR) && \
$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \
$$($(2)_WAF_OPTS) $$($(2)_WAF_OPTS)
endef endef
@ -91,7 +91,7 @@ endif
ifndef $(2)_INSTALL_STAGING_CMDS ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS
cd $$($$(PKG)_SRCDIR) && \ cd $$($$(PKG)_SRCDIR) && \
$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
install --destdir=$$(STAGING_DIR) \ install --destdir=$$(STAGING_DIR) \
$$($(2)_INSTALL_STAGING_OPTS) \ $$($(2)_INSTALL_STAGING_OPTS) \
$$($(2)_WAF_OPTS) $$($(2)_WAF_OPTS)
@ -105,7 +105,7 @@ endif
ifndef $(2)_INSTALL_TARGET_CMDS ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS
cd $$($$(PKG)_SRCDIR) && \ cd $$($$(PKG)_SRCDIR) && \
$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
install --destdir=$$(TARGET_DIR) \ install --destdir=$$(TARGET_DIR) \
$$($(2)_INSTALL_TARGET_OPTS) \ $$($(2)_INSTALL_TARGET_OPTS) \
$$($(2)_WAF_OPTS) $$($(2)_WAF_OPTS)