ninja: use Python 3

Message ID 20190711235423.23013-1-ross.burton@intel.com
State Accepted
Commit b6a84fff1fbdab49af626d221085f3c052c4021d
Headers show
Series
  • ninja: use Python 3
Related show

Commit Message

Ross Burton July 11, 2019, 11:54 p.m.
As part of the mission to remove the use of Python 2, explicitly bootstrap Ninja
with Python 3.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-devtools/ninja/ninja_1.9.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Khem Raj July 12, 2019, 12:53 a.m. | #1
On Thu, Jul 11, 2019 at 4:55 PM Ross Burton <ross.burton@intel.com> wrote:
>

> As part of the mission to remove the use of Python 2, explicitly bootstrap Ninja

> with Python 3.

>

> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>  meta/recipes-devtools/ninja/ninja_1.9.0.bb | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

>

> diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.9.0.bb

> index 1b063289614..f1236e8ac82 100644

> --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb

> +++ b/meta/recipes-devtools/ninja/ninja_1.9.0.bb

> @@ -17,11 +17,11 @@ S = "${WORKDIR}/git"

>  do_configure[noexec] = "1"

>

>  do_compile_class-native() {

> -       ./configure.py --bootstrap

> +       python3 ./configure.py --bootstrap

>  }

>

>  do_compile() {

> -       ./configure.py

> +       python3 ./configure.py


Maybe we should encode it in interpreter section inside configure.py
itself and upstream it.

>         ninja

>  }

>

> --

> 2.20.1

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton July 12, 2019, 7:49 a.m. | #2
On Fri, 12 Jul 2019 at 01:54, Khem Raj <raj.khem@gmail.com> wrote:
> Maybe we should encode it in interpreter section inside configure.py

> itself and upstream it.


I've filed a bug (https://github.com/ninja-build/ninja/issues/1601) to
see if they have any strong reasons to stick with python instead of
python3.

Ross
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton July 12, 2019, 8:08 a.m. | #3
Bug closed as 'python' doesn't have to mean Python 2.  We'll use use
python3 to start the bootstrap ourself.

On Fri, 12 Jul 2019 at 08:49, Burton, Ross <ross.burton@intel.com> wrote:
>

> On Fri, 12 Jul 2019 at 01:54, Khem Raj <raj.khem@gmail.com> wrote:

> > Maybe we should encode it in interpreter section inside configure.py

> > itself and upstream it.

>

> I've filed a bug (https://github.com/ninja-build/ninja/issues/1601) to

> see if they have any strong reasons to stick with python instead of

> python3.

>

> Ross

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj July 12, 2019, 4:43 p.m. | #4
On Fri, Jul 12, 2019 at 12:50 AM Burton, Ross <ross.burton@intel.com> wrote:
>

> On Fri, 12 Jul 2019 at 01:54, Khem Raj <raj.khem@gmail.com> wrote:

> > Maybe we should encode it in interpreter section inside configure.py

> > itself and upstream it.

>

> I've filed a bug (https://github.com/ninja-build/ninja/issues/1601) to

> see if they have any strong reasons to stick with python instead of

> python3.


OK so they are oblivious to python version which is great, I wish whole python
world was like that
>

> Ross

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.9.0.bb
index 1b063289614..f1236e8ac82 100644
--- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb
+++ b/meta/recipes-devtools/ninja/ninja_1.9.0.bb
@@ -17,11 +17,11 @@  S = "${WORKDIR}/git"
 do_configure[noexec] = "1"
 
 do_compile_class-native() {
-	./configure.py --bootstrap
+	python3 ./configure.py --bootstrap
 }
 
 do_compile() {
-	./configure.py
+	python3 ./configure.py
 	ninja
 }