summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-20 17:23:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-30 08:47:12 +0000
commitecda76eb1a631b373347d98b11918e57d546b32e (patch)
tree3d3a7012844541b4ef7b207a053af564deccae1d /scripts/lib
parent0cd9cf7d40554e8e6665f9976cc159837d626572 (diff)
downloadpoky-ecda76eb1a631b373347d98b11918e57d546b32e.tar.gz
recipetool: always use python 3 in recipe creation
(From OE-Core rev: 59e63a2d22988ef11fe36200692b967b67ca8641) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/recipetool/create_buildsys.py17
1 files changed, 4 insertions, 13 deletions
diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py
index 3cb02766c8..35a97c9345 100644
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/scripts/lib/recipetool/create_buildsys.py
@@ -226,9 +226,9 @@ class CmakeRecipeHandler(RecipeHandler):
226 elif pkg == 'PkgConfig': 226 elif pkg == 'PkgConfig':
227 inherits.append('pkgconfig') 227 inherits.append('pkgconfig')
228 elif pkg == 'PythonInterp': 228 elif pkg == 'PythonInterp':
229 inherits.append('pythonnative') 229 inherits.append('python3native')
230 elif pkg == 'PythonLibs': 230 elif pkg == 'PythonLibs':
231 inherits.append('python-dir') 231 inherits.append('python3-dir')
232 else: 232 else:
233 # Try to map via looking at installed CMake packages in pkgdata 233 # Try to map via looking at installed CMake packages in pkgdata
234 dep = find_cmake_package(pkg) 234 dep = find_cmake_package(pkg)
@@ -417,7 +417,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
417 } 417 }
418 progclassmap = {'gconftool-2': 'gconf', 418 progclassmap = {'gconftool-2': 'gconf',
419 'pkg-config': 'pkgconfig', 419 'pkg-config': 'pkgconfig',
420 'python': 'pythonnative', 420 'python': 'python3native',
421 'python3': 'python3native', 421 'python3': 'python3native',
422 'perl': 'perlnative', 422 'perl': 'perlnative',
423 'makeinfo': 'texinfo', 423 'makeinfo': 'texinfo',
@@ -566,16 +566,7 @@ class AutotoolsRecipeHandler(RecipeHandler):
566 elif keyword == 'AX_PROG_XSLTPROC': 566 elif keyword == 'AX_PROG_XSLTPROC':
567 deps.append('libxslt-native') 567 deps.append('libxslt-native')
568 elif keyword in ['AC_PYTHON_DEVEL', 'AX_PYTHON_DEVEL', 'AM_PATH_PYTHON']: 568 elif keyword in ['AC_PYTHON_DEVEL', 'AX_PYTHON_DEVEL', 'AM_PATH_PYTHON']:
569 pythonclass = 'pythonnative' 569 pythonclass = 'python3native'
570 res = version_re.search(value)
571 if res:
572 if res.group(1).startswith('3'):
573 pythonclass = 'python3native'
574 # Avoid replacing python3native with pythonnative
575 if not pythonclass in inherits and not 'python3native' in inherits:
576 if 'pythonnative' in inherits:
577 inherits.remove('pythonnative')
578 inherits.append(pythonclass)
579 elif keyword == 'AX_WITH_CURSES': 570 elif keyword == 'AX_WITH_CURSES':
580 deps.append('ncurses') 571 deps.append('ncurses')
581 elif keyword == 'AX_PATH_BDB': 572 elif keyword == 'AX_PATH_BDB':