From bedcdc4cf921b70a8cfb16c6684668d0ac9e1942 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 Mar 2017 16:19:55 +0300 Subject: dnf: move the entire dnf/rpm4 stack to Python 3 [YOCTO #11180] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/libdnf/libdnf_git.bb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'meta/recipes-devtools/libdnf') diff --git a/meta/recipes-devtools/libdnf/libdnf_git.bb b/meta/recipes-devtools/libdnf/libdnf_git.bb index 6e9cfcc862..ef28611f8a 100644 --- a/meta/recipes-devtools/libdnf/libdnf_git.bb +++ b/meta/recipes-devtools/libdnf/libdnf_git.bb @@ -17,20 +17,9 @@ S = "${WORKDIR}/git" DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc" -inherit gtk-doc gobject-introspection cmake pkgconfig - -# We cannot inherit pythonnative (or descendant classes like distutils etc.) -# because that would conflict with inheriting python3native -# (which is done by inheriting gobject-introspection). -# But libdnf only needs the path to native Python 2.x binary -# so we simply set it explicitly here. -# -# These lines can be dropped when dnf stack is moved to python 3.x -EXTRANATIVEPATH += "python-native" -FILES_${PN} += " ${libdir}/python2.7/*" -DEPENDS += "python-native" - -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF \ +inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base + +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \ " EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" -- cgit 1.2.3-korg