diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-11-26 21:33:57 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-11-27 10:45:51 +0100 |
commit | f264e5dd1b589a1cf2d3904bd8c88605de43c5f6 (patch) | |
tree | e3b60dc0ccdbd20c83efb9425c5457412eb22819 /recipes-qt | |
parent | f6ad80f95ae9951fc8830dcf2cdec6430fb2d910 (diff) | |
download | meta-qt5-f264e5dd1b589a1cf2d3904bd8c88605de43c5f6.tar.gz |
qtdeclarative: Ask for python3 explicitly
Python2 is going out in Jan 2020
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch | 60 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 4 |
2 files changed, 63 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch new file mode 100644 index 00000000..e1067016 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Use-python3-explicitly.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From dc94032e6132b41bd6927357e4a57c31436294eb Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 26 Nov 2019 21:10:03 -0800 | ||
4 | Subject: [PATCH] Use python3 explicitly | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | qtdeclarative.pro | 2 +- | ||
9 | src/3rdparty/masm/masm.pri | 4 ++-- | ||
10 | tests/auto/qml/ecmascripttests/test262.py | 2 +- | ||
11 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/qtdeclarative.pro b/qtdeclarative.pro | ||
14 | index 5b94da9b6..0e3496ce8 100644 | ||
15 | --- a/qtdeclarative.pro | ||
16 | +++ b/qtdeclarative.pro | ||
17 | @@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools | ||
18 | load(qt_parts) | ||
19 | |||
20 | !python_available { | ||
21 | - py_out = $$system('python -c "print(1)"') | ||
22 | + py_out = $$system('python3 -c "print(1)"') | ||
23 | !equals(py_out, 1): error("Building QtQml requires Python.") | ||
24 | tmp = python_available | ||
25 | CONFIG += $$tmp | ||
26 | diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri | ||
27 | index 0e63ac2ce..7a30ab64e 100644 | ||
28 | --- a/src/3rdparty/masm/masm.pri | ||
29 | +++ b/src/3rdparty/masm/masm.pri | ||
30 | @@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { | ||
31 | udis86.output = udis86_itab.h | ||
32 | udis86.input = ITAB | ||
33 | udis86.CONFIG += no_link | ||
34 | - udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} | ||
35 | + udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} | ||
36 | QMAKE_EXTRA_COMPILERS += udis86 | ||
37 | |||
38 | udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c | ||
39 | @@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h | ||
40 | retgen.script = $$PWD/yarr/create_regex_tables | ||
41 | retgen.input = retgen.script | ||
42 | retgen.CONFIG += no_link | ||
43 | -retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} | ||
44 | +retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT} | ||
45 | QMAKE_EXTRA_COMPILERS += retgen | ||
46 | |||
47 | # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
48 | diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py | ||
49 | index 19551e3ba..bf3f79a45 100755 | ||
50 | --- a/tests/auto/qml/ecmascripttests/test262.py | ||
51 | +++ b/tests/auto/qml/ecmascripttests/test262.py | ||
52 | @@ -1,4 +1,4 @@ | ||
53 | -#!/usr/bin/env python | ||
54 | +#!/usr/bin/env python3 | ||
55 | ############################################################################# | ||
56 | ## | ||
57 | ## Copyright (C) 2017 The Qt Company Ltd. | ||
58 | -- | ||
59 | 2.24.0 | ||
60 | |||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index a66a646b..47833942 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = " \ | |||
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch" | 15 | SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ |
16 | file://0001-Use-python3-explicitly.patch \ | ||
17 | " | ||
16 | 18 | ||
17 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
18 | 20 | ||