* [Buildroot] [PATCH 1/1] package/pkg-waf: use host-python3
@ 2020-02-04 21:59 Titouan Christophe
2020-04-29 21:41 ` Romain Naour
0 siblings, 1 reply; 2+ messages in thread
From: Titouan Christophe @ 2020-02-04 21:59 UTC (permalink / raw)
To: buildroot
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>
---
NB: this patch should be merged after the following patches are merged first:
- gst1-imx (https://patchwork.ozlabs.org/patch/1233580/)
- libimxvpuapi (https://patchwork.ozlabs.org/patch/1233460/)
- norm (https://patchwork.ozlabs.org/project/buildroot/list/?series=156705)
Dear committers, very sorry for that. I wasn't sure to finish on time to make
a single waf python3 series.
---
package/pkg-waf.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
index a32d5dab33..35e56d3c13 100644
--- a/package/pkg-waf.mk
+++ b/package/pkg-waf.mk
@@ -36,8 +36,8 @@
define inner-waf-package
-# We need host-python to run waf
-$(2)_DEPENDENCIES += host-python
+# We need host-python3 to run waf
+$(2)_DEPENDENCIES += host-python3
$(2)_NEEDS_EXTERNAL_WAF ?= NO
@@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS
cd $$($$(PKG)_SRCDIR) && \
$$(TARGET_CONFIGURE_OPTS) \
$$($(2)_CONF_ENV) \
- $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \
+ $$(HOST_DIR)/bin/python3 $$($(2)_WAF) configure \
--prefix=/usr \
--libdir=/usr/lib \
$$($(2)_CONF_OPTS) \
@@ -78,7 +78,7 @@ endif
ifndef $(2)_BUILD_CMDS
define $(2)_BUILD_CMDS
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) \
$$($(2)_WAF_OPTS)
endef
@@ -91,7 +91,7 @@ endif
ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
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) \
$$($(2)_INSTALL_STAGING_OPTS) \
$$($(2)_WAF_OPTS)
@@ -105,7 +105,7 @@ endif
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
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) \
$$($(2)_INSTALL_TARGET_OPTS) \
$$($(2)_WAF_OPTS)
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/pkg-waf: use host-python3
2020-02-04 21:59 [Buildroot] [PATCH 1/1] package/pkg-waf: use host-python3 Titouan Christophe
@ 2020-04-29 21:41 ` Romain Naour
0 siblings, 0 replies; 2+ messages in thread
From: Romain Naour @ 2020-04-29 21:41 UTC (permalink / raw)
To: buildroot
Hi Titouan,All,
Le 04/02/2020 ? 22:59, Titouan Christophe a ?crit?:
> 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>
> ---
> NB: this patch should be merged after the following patches are merged first:
> - gst1-imx (https://patchwork.ozlabs.org/patch/1233580/)
> - libimxvpuapi (https://patchwork.ozlabs.org/patch/1233460/)
> - norm (https://patchwork.ozlabs.org/project/buildroot/list/?series=156705)
So now all these patches are merged, this patch is ok for master.
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Best regards,
Romain
>
> Dear committers, very sorry for that. I wasn't sure to finish on time to make
> a single waf python3 series.
> ---
> package/pkg-waf.mk | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
> index a32d5dab33..35e56d3c13 100644
> --- a/package/pkg-waf.mk
> +++ b/package/pkg-waf.mk
> @@ -36,8 +36,8 @@
>
> define inner-waf-package
>
> -# We need host-python to run waf
> -$(2)_DEPENDENCIES += host-python
> +# We need host-python3 to run waf
> +$(2)_DEPENDENCIES += host-python3
>
> $(2)_NEEDS_EXTERNAL_WAF ?= NO
>
> @@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS
> cd $$($$(PKG)_SRCDIR) && \
> $$(TARGET_CONFIGURE_OPTS) \
> $$($(2)_CONF_ENV) \
> - $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \
> + $$(HOST_DIR)/bin/python3 $$($(2)_WAF) configure \
> --prefix=/usr \
> --libdir=/usr/lib \
> $$($(2)_CONF_OPTS) \
> @@ -78,7 +78,7 @@ endif
> ifndef $(2)_BUILD_CMDS
> define $(2)_BUILD_CMDS
> 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) \
> $$($(2)_WAF_OPTS)
> endef
> @@ -91,7 +91,7 @@ endif
> ifndef $(2)_INSTALL_STAGING_CMDS
> define $(2)_INSTALL_STAGING_CMDS
> 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) \
> $$($(2)_INSTALL_STAGING_OPTS) \
> $$($(2)_WAF_OPTS)
> @@ -105,7 +105,7 @@ endif
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> 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) \
> $$($(2)_INSTALL_TARGET_OPTS) \
> $$($(2)_WAF_OPTS)
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-29 21:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 21:59 [Buildroot] [PATCH 1/1] package/pkg-waf: use host-python3 Titouan Christophe
2020-04-29 21:41 ` Romain Naour
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.