Patchwork [meta-oe,8/8] python-pyqt: don't bypass sstate with sip files

login
mail settings
Submitter Martin Jansa
Date Oct. 24, 2012, 11:54 p.m.
Message ID <aed8dd11206928592383ac402c2e2bf7e73a2d08.1351122431.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/38553/
State Accepted
Commit 00fe75fb5773cf5602a20a50ed299ed287dd6ebd
Headers show

Comments

Martin Jansa - Oct. 24, 2012, 11:54 p.m.
* discovered with http://patchwork.openembedded.org/patch/38521/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Patch

diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
index 5eef4c9..e248fbb 100644
--- a/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
+++ b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
@@ -15,6 +15,7 @@  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 \
@@ -88,22 +89,15 @@  do_configure_prepend() {
 
 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/
-
-    install -d ${STAGING_SIPDIR}/qt/
-    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
-    for module in ${SIP_MODULES}
-    do
-        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
-        install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
-    done
 }
 
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
-
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/qt/"