diff options
author | Philip Balister <philip@opensdr.com> | 2018-10-04 13:22:22 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-11-13 11:09:05 +0000 |
commit | fd1f0f47312e7ee80e5ca65b8b2992cb068b1656 (patch) | |
tree | a59173e0b49c77015a7a7b055cf0a98ee0e2d080 /recipes-python | |
parent | 3fa199310a6bb42befeb2136d144054815d46bdf (diff) |
python-pyqt5: Update to 5.11.3 and add python3 recipe.
Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-python')
-rw-r--r-- | recipes-python/pyqt5/python-pyqt5.inc (renamed from recipes-python/pyqt5/python-pyqt5_5.10.1.bb) | 29 | ||||
-rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.11.3.bb | 8 | ||||
-rw-r--r-- | recipes-python/pyqt5/python3-pyqt5_5.11.3.bb | 7 |
3 files changed, 27 insertions, 17 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5.inc index 505db59d..c5ff46cf 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb +++ b/recipes-python/pyqt5/python-pyqt5.inc @@ -6,20 +6,16 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "\ file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ " -DEPENDS = "sip sip-native qtbase python" - SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ " -SRC_URI[md5sum] = "be36c2abaffc9daa8b993f1ca982968f" -SRC_URI[sha256sum] = "9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef" +SRC_URI[md5sum] = "aac3428e90eca5df68c5764282fd9b98" +SRC_URI[sha256sum] = "c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073" S = "${WORKDIR}/PyQt5_gpl-${PV}" - -inherit qmake5 pythonnative python-dir distro_features_check -# depends on qt4-x11-free -REQUIRED_DISTRO_FEATURES = "x11" +inherit qmake5 +DEPENDS = "qtbase" export BUILD_SYS export HOST_SYS @@ -36,19 +32,19 @@ 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%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_lib = python%(py_major).%(py_minor)mu" >> pyqt.cfg - echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> 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 "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg - echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "pyuic_interpreter = ${D}/${bindir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg echo "qt_shared = True" >> pyqt.cfg QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` echo "[Qt $QT_VERSION]" >> pyqt.cfg echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg - echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} + echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} } do_compile() { @@ -61,7 +57,6 @@ do_install() { oe_runmake install } -RDEPENDS_${PN} = "python-core python-sip qtbase" - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" +FILES_${PN} += "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages ${datadir}/sip/PyQt5/" +RDEPENDS_${PN} = "qtbase" diff --git a/recipes-python/pyqt5/python-pyqt5_5.11.3.bb b/recipes-python/pyqt5/python-pyqt5_5.11.3.bb new file mode 100644 index 00000000..6b1b5701 --- /dev/null +++ b/recipes-python/pyqt5/python-pyqt5_5.11.3.bb @@ -0,0 +1,8 @@ +require python-pyqt5.inc + +inherit pythonnative python-dir + +DEPENDS += "sip sip-native python" + +RDEPENDS_${PN} += "python-core python-sip" + diff --git a/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb b/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb new file mode 100644 index 00000000..200a8154 --- /dev/null +++ b/recipes-python/pyqt5/python3-pyqt5_5.11.3.bb @@ -0,0 +1,7 @@ +require python-pyqt5.inc + +inherit python3native python3-dir + +DEPENDS += "sip3 sip3-native python3" + +RDEPENDS_${PN} += "python3-core python3-sip3" |