From 89de99e7e216fc52b6f1956f706e398190c3baf6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 19 Feb 2020 20:19:21 +0100 Subject: python-{pyqt5,pyqtchart}: fold .inc file into .bb * drop 2nd DEPENDS assignment from python-pyqtchart.inc Signed-off-by: Martin Jansa --- recipes-python/pyqt5/python-pyqt5.inc | 63 --------------------- recipes-python/pyqt5/python3-pyqt5_5.13.2.bb | 62 +++++++++++++++++++- recipes-python/pyqtchart/python-pyqtchart.inc | 66 ---------------------- .../pyqtchart/python3-pyqtchart_5.13.1.bb | 63 ++++++++++++++++++++- 4 files changed, 123 insertions(+), 131 deletions(-) delete mode 100644 recipes-python/pyqt5/python-pyqt5.inc delete mode 100644 recipes-python/pyqtchart/python-pyqtchart.inc diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc deleted file mode 100644 index 47bf5b9d..00000000 --- a/recipes-python/pyqt5/python-pyqt5.inc +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "Python Qt5 Bindings" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -HOMEPAGE = "http://riverbankcomputing.co.uk" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ -" -SRC_URI = "\ - https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0" -SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827" - -S = "${WORKDIR}/PyQt5-${PV}" - -inherit qmake5 -DEPENDS = "qtbase qtdeclarative qtquickcontrols2" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PARALLEL_MAKEINST = "" - -DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)}" - -DISABLED_FEATURES_append_arm = " PyQt_qreal_double" - -PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}" - -do_configure_prepend() { - cd ${S} - echo "py_platform = linux" > 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%(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` - 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} -} - -do_compile() { - cd ${S} - oe_runmake -} - -do_install() { - cd ${S} - oe_runmake MAKEFLAGS='-j 1' install -} - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" - -RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs" diff --git a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb index 200a8154..69d2fce7 100644 --- a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb +++ b/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb @@ -1,7 +1,67 @@ -require python-pyqt5.inc +SUMMARY = "Python Qt5 Bindings" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +HOMEPAGE = "http://riverbankcomputing.co.uk" +SECTION = "devel/python" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ +" +SRC_URI = "\ + https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0" +SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827" +S = "${WORKDIR}/PyQt5-${PV}" + +inherit qmake5 inherit python3native python3-dir +DEPENDS = "qtbase qtdeclarative qtquickcontrols2" DEPENDS += "sip3 sip3-native python3" +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + +PARALLEL_MAKEINST = "" + +DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)}" + +DISABLED_FEATURES_append_arm = " PyQt_qreal_double" + +PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}" + +do_configure_prepend() { + cd ${S} + echo "py_platform = linux" > 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%(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` + 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} +} + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + cd ${S} + oe_runmake MAKEFLAGS='-j 1' install +} + +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" + +RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs" RDEPENDS_${PN} += "python3-core python3-sip3" diff --git a/recipes-python/pyqtchart/python-pyqtchart.inc b/recipes-python/pyqtchart/python-pyqtchart.inc deleted file mode 100644 index e8dba18a..00000000 --- a/recipes-python/pyqtchart/python-pyqtchart.inc +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Python Qt Chart Bindings" -AUTHOR = "Adrian.Fiergolski@fastree3d.com" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ -" -SRC_URI = "\ - https://www.riverbankcomputing.com/static/Downloads/PyQtChart/${PV}/PyQtChart-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "d5d37bff46b690d6318e5e5f25dd5213" -SRC_URI[sha256sum] = "49960a1483527857b38c1527f9b6328d30bdcc84521f579c0a561a892f54130e" - -S = "${WORKDIR}/PyQtChart-${PV}" - -inherit qmake5 -DEPENDS = "qtbase qtdeclarative qtquickcontrols2" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PARALLEL_MAKEINST = "" - -DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" - -DISABLED_FEATURES_append_arm = " PyQt_qreal_double" - -do_configure_prepend() { - cd ${S} - echo "[PyQt 5]" > pyqt.cfg - echo "py_platform = linux" >> 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 "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg - echo "py_sip_dir = ${STAGING_EXECPREFIXDIR}/share/sip" >> pyqt.cfg - echo "sip_module = PyQt5.sip" >> pyqt.cfg - echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg - echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} -} - -do_configure_append() { - #Fix installation paths - sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/Makefile - sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/QtChart/Makefile - #Skip installed.txt creation - sed -i -e s:" install_distinfo ":" ": ${S}/Makefile -} - -do_compile() { - cd ${S} - oe_runmake -} - -do_install() { - cd ${S} - oe_runmake MAKEFLAGS='-j 1' install -} - - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/" - -DEPENDS = "qtcharts" - -RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts" diff --git a/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb b/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb index 899f9691..9a81b490 100644 --- a/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb +++ b/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb @@ -1,7 +1,68 @@ -require python-pyqtchart.inc +SUMMARY = "Python Qt Chart Bindings" +AUTHOR = "Adrian.Fiergolski@fastree3d.com" +SECTION = "devel/python" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ +" +SRC_URI = "\ + https://www.riverbankcomputing.com/static/Downloads/PyQtChart/${PV}/PyQtChart-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "d5d37bff46b690d6318e5e5f25dd5213" +SRC_URI[sha256sum] = "49960a1483527857b38c1527f9b6328d30bdcc84521f579c0a561a892f54130e" +S = "${WORKDIR}/PyQtChart-${PV}" + +inherit qmake5 inherit python3native python3-dir +DEPENDS = "qtcharts" DEPENDS += "sip3 sip3-native python3 python3-pyqt5" +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + +PARALLEL_MAKEINST = "" + +DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" + +DISABLED_FEATURES_append_arm = " PyQt_qreal_double" + +do_configure_prepend() { + cd ${S} + echo "[PyQt 5]" > pyqt.cfg + echo "py_platform = linux" >> 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 "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg + echo "py_sip_dir = ${STAGING_EXECPREFIXDIR}/share/sip" >> pyqt.cfg + echo "sip_module = PyQt5.sip" >> pyqt.cfg + echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg + echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} +} + +do_configure_append() { + #Fix installation paths + sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/Makefile + sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/QtChart/Makefile + #Skip installed.txt creation + sed -i -e s:" install_distinfo ":" ": ${S}/Makefile +} + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + cd ${S} + oe_runmake MAKEFLAGS='-j 1' install +} + + +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/" + +RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts" RDEPENDS_${PN} += "python3-core python3-sip3 python3-pyqt5" -- cgit v1.2.3