diff options
| author | Philip Balister <philip@opensdr.com> | 2019-02-13 18:11:43 -0500 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-12 10:01:39 +0000 |
| commit | 6a1a387a506f62c66a00c6935dd476a39811cd7e (patch) | |
| tree | f501107068ef681d83c256d8a059f148aeda5603 | |
| parent | c7e0ba566f136a55ce69287cd3f72952b3a43687 (diff) | |
python-pyqt: Fix annoying problems.
* Python ABI only applies to include files.
Signed-off-by: Philip Balister <philip@opensdr.com>
| -rw-r--r-- | recipes-python/pyqt5/python-pyqt5.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc index 4b1630d4..15897ed5 100644 --- a/recipes-python/pyqt5/python-pyqt5.inc +++ b/recipes-python/pyqt5/python-pyqt5.inc @@ -34,13 +34,13 @@ PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" do_configure_prepend() { cd ${S} echo "py_platform = linux" > pyqt.cfg - echo "py_inc_dir = %(sysroot)/$includedir/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg - echo "py_pylib_dir = %(sysroot)/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg - echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg - echo "pyqt_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> pyqt.cfg + echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg + echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> pyqt.cfg + echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg - echo "pyuic_interpreter = ${D}/${bindir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg + echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg echo "qt_shared = True" >> pyqt.cfg QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` @@ -59,6 +59,6 @@ do_install() { oe_runmake MAKEFLAGS='-j 1' install } -FILES_${PN} += "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages ${datadir}/sip/PyQt5/" +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" RDEPENDS_${PN} = "qtbase" |