From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 03/11] recipetool: always use python 3 in recipe creation
Date: Fri, 20 Dec 2019 17:23:43 +0100 [thread overview]
Message-ID: <20191220162351.94498-3-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20191220162351.94498-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
scripts/lib/recipetool/create_buildsys.py | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py
index 3cb02766c87..35a97c93454 100644
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/scripts/lib/recipetool/create_buildsys.py
@@ -226,9 +226,9 @@ class CmakeRecipeHandler(RecipeHandler):
elif pkg == 'PkgConfig':
inherits.append('pkgconfig')
elif pkg == 'PythonInterp':
- inherits.append('pythonnative')
+ inherits.append('python3native')
elif pkg == 'PythonLibs':
- inherits.append('python-dir')
+ inherits.append('python3-dir')
else:
# Try to map via looking at installed CMake packages in pkgdata
dep = find_cmake_package(pkg)
@@ -417,7 +417,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
}
progclassmap = {'gconftool-2': 'gconf',
'pkg-config': 'pkgconfig',
- 'python': 'pythonnative',
+ 'python': 'python3native',
'python3': 'python3native',
'perl': 'perlnative',
'makeinfo': 'texinfo',
@@ -566,16 +566,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
elif keyword == 'AX_PROG_XSLTPROC':
deps.append('libxslt-native')
elif keyword in ['AC_PYTHON_DEVEL', 'AX_PYTHON_DEVEL', 'AM_PATH_PYTHON']:
- pythonclass = 'pythonnative'
- res = version_re.search(value)
- if res:
- if res.group(1).startswith('3'):
- pythonclass = 'python3native'
- # Avoid replacing python3native with pythonnative
- if not pythonclass in inherits and not 'python3native' in inherits:
- if 'pythonnative' in inherits:
- inherits.remove('pythonnative')
- inherits.append(pythonclass)
+ pythonclass = 'python3native'
elif keyword == 'AX_WITH_CURSES':
deps.append('ncurses')
elif keyword == 'AX_PATH_BDB':
--
2.17.1
next prev parent reply other threads:[~2019-12-20 16:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 16:23 [PATCH 01/11] elfutils: upgrade 0.177 -> 0.178 Alexander Kanavin
2019-12-20 16:23 ` [PATCH 02/11] acl/attr: restore the package split Alexander Kanavin
2019-12-20 16:23 ` Alexander Kanavin [this message]
2019-12-20 16:23 ` [PATCH 04/11] core-image-testmaster: use Python 3 Alexander Kanavin
2019-12-20 16:23 ` [PATCH 05/11] ptest-packagelists: drop python 2.x Alexander Kanavin
2019-12-20 16:23 ` [PATCH 06/11] ltp: fix build with musl Alexander Kanavin
2019-12-20 16:23 ` [PATCH 07/11] diffstat: update to 1.63 Alexander Kanavin
2019-12-20 16:23 ` [PATCH 08/11] prelink: upgrade to latest revision (in the cross_prelink branch) Alexander Kanavin
2019-12-20 16:23 ` [PATCH 09/11] libxml-parser-perl: update to 2.46 Alexander Kanavin
2019-12-20 16:23 ` [PATCH 10/11] libcap: update to 2.28 Alexander Kanavin
2019-12-29 9:22 ` Richard Purdie
2019-12-29 9:46 ` Alexander Kanavin
2019-12-20 16:23 ` [PATCH 11/11] kexec-tools: update to 2.0.20 Alexander Kanavin
2019-12-20 16:32 ` ✗ patchtest: failure for "elfutils: upgrade 0.177 -> 0.1..." and 10 more Patchwork
2019-12-29 17:18 ` [PATCH 01/11] elfutils: upgrade 0.177 -> 0.178 Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191220162351.94498-3-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox