MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

recipetool: always use python 3 in recipe creation

Browse Source 
(From OE-Core rev: 59e63a2d22988ef11fe36200692b967b67ca8641)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2019-12-20 17:23:43 +01:00 committed by Richard Purdie
parent 0cd9cf7d40
commit ecda76eb1a
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/lib/recipetool/create_buildsys.py
View File

@ -226,9 +226,9 @@ class CmakeRecipeHandler(RecipeHandler):
elif pkg == 'PkgConfig': elif pkg == 'PkgConfig':
inherits.append('pkgconfig') inherits.append('pkgconfig')
elif pkg == 'PythonInterp': elif pkg == 'PythonInterp':
inherits.append('pythonnative') inherits.append('python3native')
elif pkg == 'PythonLibs': elif pkg == 'PythonLibs':
inherits.append('python-dir') inherits.append('python3-dir')
else: else:
# Try to map via looking at installed CMake packages in pkgdata # Try to map via looking at installed CMake packages in pkgdata
dep = find_cmake_package(pkg) dep = find_cmake_package(pkg)
@ -417,7 +417,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
} }
progclassmap = {'gconftool-2': 'gconf', progclassmap = {'gconftool-2': 'gconf',
'pkg-config': 'pkgconfig', 'pkg-config': 'pkgconfig',
'python': 'pythonnative', 'python': 'python3native',
'python3': 'python3native', 'python3': 'python3native',
'perl': 'perlnative', 'perl': 'perlnative',
'makeinfo': 'texinfo', 'makeinfo': 'texinfo',
@ -566,16 +566,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
elif keyword == 'AX_PROG_XSLTPROC': elif keyword == 'AX_PROG_XSLTPROC':
deps.append('libxslt-native') deps.append('libxslt-native')
elif keyword in ['AC_PYTHON_DEVEL', 'AX_PYTHON_DEVEL', 'AM_PATH_PYTHON']: elif keyword in ['AC_PYTHON_DEVEL', 'AX_PYTHON_DEVEL', 'AM_PATH_PYTHON']:
pythonclass = 'pythonnative' pythonclass = 'python3native'
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)
elif keyword == 'AX_WITH_CURSES': elif keyword == 'AX_WITH_CURSES':
deps.append('ncurses') deps.append('ncurses')
elif keyword == 'AX_PATH_BDB': elif keyword == 'AX_PATH_BDB':