mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
dnf: move the entire dnf/rpm4 stack to Python 3
[YOCTO #11180] (From OE-Core rev: bedcdc4cf921b70a8cfb16c6684668d0ac9e1942) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3d29214b20
commit
8c1c392ca3
@@ -17,20 +17,9 @@ S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc"
|
||||
|
||||
inherit gtk-doc gobject-introspection cmake pkgconfig
|
||||
inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base
|
||||
|
||||
# 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 \
|
||||
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"
|
||||
|
||||
Reference in New Issue
Block a user