[oe] [meta-oe][PATCH 2/3] python-pyqt : Update to 4.11.3.
Martin Jansa
martin.jansa at gmail.com
Wed Dec 3 15:09:07 UTC 2014
On Tue, Nov 25, 2014 at 11:09:35AM -0500, Philip Balister wrote:
> The configure.py script now has support for cross compiling. This
> simplified the recipe substantially.
>
> The recipe was tested with gnuradio-companion on the zedboard and
> ettus-e300. This is the first time we have been able to use grc with
> pyqt built with OpenEmbedded.
Fails to build for qemux86 in world builds:
| i586-oe-linux-g++ -m32 -march=i586 --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 -c -pipe -O2 -pipe -g -feliminate-unused-debug-types -fvisibility-inlines-hidden -fno-exceptions -O2 -Wall -W -D_REENTRANT -fPIC -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public -DQT_NO_DEBUG -DQT_PLUGIN -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/share/qt4/mkspecs/linux-g++ -I. -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/qt4/QtCore -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/qt4/QtGui -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/qt4 -I. -I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86/usr/include/python2.7 -I../qpy/QtGui -I. -o sipQtGuiQGraphicsLayout.o sipQtGuiQGraphicsLayout.cpp
| /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/python-pyqt/4.11.3-r0/PyQt-x11-gpl-4.11.3/QtGui/sipQtGuiQGraphicsLayout.cpp: In member function 'virtual void sipQGraphicsLayout::getContentsMargins(qreal*, qreal*, qreal*, qreal*) const':
| /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/python-pyqt/4.11.3-r0/PyQt-x11-gpl-4.11.3/QtGui/sipQtGuiQGraphicsLayout.cpp:246:71: error: cannot convert 'qreal* {aka double*}' to 'float*' for argument '5' to 'void sipVH_QtGui_197(sip_gilstate_t, sipVirtErrorHandlerFunc, sipSimpleWrapper*, PyObject*, float*, float*, float*, float*)'
| sipVH_QtGui_197(sipGILState, 0, sipPySelf, sipMeth, a0, a1, a2, a3);
| ^
| make[1]: *** [sipQtGuiQGraphicsLayout.o] Error 1
| make[1]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/python-pyqt/4.11.3-r0/PyQt-x11-gpl-4.11.3/QtGui'
| make: *** [sub-QtGui-make_default-ordered] Error 2
| ERROR: oe_runmake failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/python-pyqt/4.11.3-r0/temp/log.do_compile.19265)
NOTE: recipe python-pyqt-4.11.3-r0: task do_compile: Failed
ERROR: Task 20439 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb, do_compile) failed with exit code '1'
>
> Signed-off-by: Philip Balister <philip at balister.org>
> ---
> .../recipes-devtools/python/python-pyqt_4.11.3.bb | 50 ++++++++++
> .../recipes-devtools/python/python-pyqt_4.9.6.bb | 103 ---------------------
> 2 files changed, 50 insertions(+), 103 deletions(-)
> create mode 100644 meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
> delete mode 100644 meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb
>
> diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
> new file mode 100644
> index 0000000..5ced2ad
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb
> @@ -0,0 +1,50 @@
> +SUMMARY = "Python Qt4 Bindings"
> +AUTHOR = "Phil Thomson @ riverbank.co.uk"
> +HOMEPAGE = "http://riverbankcomputing.co.uk"
> +SECTION = "devel/python"
> +LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION"
> +LIC_FILES_CHKSUM = "\
> + file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \
> + file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \
> + file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \
> + file://LICENSE.GPL2;md5=577ff65f6653562af318bfc3944b1f20 \
> + file://LICENSE.GPL3;md5=feee51612c3c1191a1d5f41156fa2c75 \
> +"
> +DEPENDS = "sip sip-native qt4-x11-free"
> +
> +SRC_URI = "\
> + ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \
> +"
> +SRC_URI[md5sum] = "997c3e443165a89a559e0d96b061bf70"
> +SRC_URI[sha256sum] = "853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686"
> +
> +S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
> +
> +PARALLEL_MAKE = ""
> +
> +inherit qmake2 pythonnative python-dir
> +
> +do_configure() {
> + 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 "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
> + echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt4" >> pyqt.cfg
> + echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg
> + echo "pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double PyQt_Accessibility PyQt_SessionManager" >> pyqt.cfg
> + echo "qt_shared = True" >> pyqt.cfg
> + echo "[Qt 4.8]" >> pyqt.cfg
> + echo "pyqt_modules = QtCore QtGui QtDeclarative QtNetwork QtSvg QtWebKit" >> pyqt.cfg
> + echo yes | python configure-ng.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qmake2 --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
> +}
> +do_install() {
> + oe_runmake install
> +}
> +
> +RDEPENDS_${PN} = "python-core"
> +
> +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt4/"
> +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/"
> +
> diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb
> deleted file mode 100644
> index 2f0e189..0000000
> --- a/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -SUMMARY = "Python Qt4 Bindings"
> -HOMEPAGE = "http://riverbankcomputing.co.uk"
> -AUTHOR = "Phil Thomson @ riverbank.co.uk"
> -SECTION = "devel/python"
> -LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION"
> -LIC_FILES_CHKSUM = "\
> - file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \
> - file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \
> - file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \
> - file://LICENSE.GPL2;md5=276c6b9cad5f85a3af3534299825feff \
> - file://LICENSE.GPL3;md5=eda942b9c6ba7eb0f40fee79e94950d5 \
> -"
> -
> -DEPENDS = "sip-native python-sip"
> -RDEPENDS_${PN} = "python-core"
> -
> -PYQT_OE_VERSION = "Qt_4_8_3"
> -PR = "r1"
> -
> -SRC_URI = "\
> - ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \
> - file://pyqt-generated.patch;apply=no \
> -"
> -SRC_URI[md5sum] = "514e1f9597771dc732ba75ba9fa5c6b6"
> -SRC_URI[sha256sum] = "a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d"
> -S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
> -
> -# arm and mips machines need some extra patches
> -SRC_URI_append_arm = "\
> - file://qreal_float_support.diff \
> -"
> -
> -SRC_URI_append_mipsel = "\
> - file://qreal_float_support.diff \
> -"
> -
> -inherit qt4x11 sip distutils-base
> -
> -PARALLEL_MAKE = ""
> -
> -QMAKE_PROFILES = "pyqt.pro"
> -# NOTE: has to match with MIN(qt version we have in OE, last known Qt version by SIP/PyQt)
> -EXTRA_SIPTAGS = "-tWS_X11 -t${PYQT_OE_VERSION} -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
> -EXTRA_OEMAKE = " MAKEFLAGS= "
> -
> -# arm and mips need extra params for the qreal issue
> -EXTRA_SIPTAGS_append_arm = " -x PyQt_qreal_double"
> -EXTRA_SIPTAGS_append_mipsel = " -x PyQt_qreal_double"
> -
> -SIP_MODULES = "QtCore QtDeclarative QtGui QtNetwork QtSql QtSvg QtXml QtWebKit"
> -MAKE_MODULES = "qpy ${SIP_MODULES}"
> -
> -EXTRA_QMAKEVARS_POST += "\
> - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
> - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
> - INCLUDEPATH+=../qpy/QtCore \
> - INCLUDEPATH+=../qpy/QtGui \
> - INCLUDEPATH+=../qpy/QtDeclarative \
> - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtCore \
> - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtGui \
> - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtDeclarative \
> - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtWebKit \
> - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtNetwork \
> -"
> -FIX_QREAL = "\
> -"
> -
> -do_generate_prepend() {
> - for i in ${FIX_QREAL}; do
> - sed -i -e s,qreal,float,g sip/$i
> - done
> -}
> -
> -do_configure_prepend() {
> - printf "TEMPLATE=subdirs\nSUBDIRS=${MAKE_MODULES}\n" >pyqt.pro
> - printf "TEMPLATE=subdirs\nSUBDIRS=QtCore QtDeclarative QtGui\n" >qpy/qpy.pro
> - ln -sf ./qpycore.pro qpy/QtCore/QtCore.pro
> - ln -sf ./qpydeclarative.pro qpy/QtDeclarative/QtDeclarative.pro
> - ln -sf ./qpygui.pro qpy/QtGui/QtGui.pro
> - echo "INCLUDEPATH+=${S}/QtCore" >>qpy/QtCore/QtCore.pro
> - echo "INCLUDEPATH+=${S}/QtGui" >>qpy/QtGui/QtGui.pro
> - echo "INCLUDEPATH+=${S}/QtDeclarative" >>qpy/QtDeclarative/QtDeclarative.pro
> - echo "LIBS+=-L../qpy/QtGui/ -lqpygui" >>QtGui/QtGui.pro
> - echo "LIBS+=-L../qpy/QtCore/ -lqpycore" >>QtCore/QtCore.pro
> - echo "LIBS+=-L../qpy/QtDeclarative/ -lqpydeclarative" >>QtDeclarative/QtDeclarative.pro
> - # hack for broken generated code (duplicated sipCpp declaration).
> - patch -p1 < ${WORKDIR}/pyqt-generated.patch || echo "pyqt-generated.patch failed to apply, probably reexecuting do_configure, ignoring that"
> -}
> -
> -do_install() {
> - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
> - install -d ${D}${datadir}/sip/qt/
> - for module in ${SIP_MODULES}
> - do
> - install -m 0644 ${S}/sip/${module}/*.sip ${D}${datadir}/sip/qt/
> - echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
> - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
> - done
> - cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
> - cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
> -}
> -
> -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/qt/"
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20141203/6bbd1c52/attachment-0005.sig>
More information about the Openembedded-devel
mailing list