Patchwork [meta-oe,meta-efl,3/5] sip-native: inherit qmake2 instead of qt4x11

login
register
mail settings
Submitter Martin Jansa
Date Sept. 11, 2012, 2:19 p.m.
Message ID <469c1599ceef77295ee1729fe67689e39badffa2.1347363666.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/36295/
State Accepted
Commit 469c1599ceef77295ee1729fe67689e39badffa2
Headers show

Comments

Martin Jansa - Sept. 11, 2012, 2:19 p.m.
* it seems enough
* inherit qt4x11 adds dependency on target qt4-x11-free, which is bad,
  because we don't need it and it's causing different sstate checksum:
  $ bitbake-diffsigs
    stamps.1347348593/nokia900/x86_64-linux/sip-native-4.13.3-r0.do_configure.sigdata.6e44871660ef91eab5ee4d56e55b6728
    stamps.1347348593/om-gta02/x86_64-linux/sip-native-4.13.3-r0.do_configure.sigdata.cdaf666b98c2c6ccfb710743dcdbd988
      Hash for dependent task qt4-x11-free_4.8.1.bb.do_populate_sysroot changed from 79234aca07686c1d97782e21fc098071 to 7e9ba3de3ba9f709a5d9ef5abadb2d9e

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/sip/sip-native_4.13.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb b/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
index 2ef10bf..c20683f 100644
--- a/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
+++ b/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
@@ -9,8 +9,9 @@  SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.t
 SRC_URI[md5sum] = "76192829cc42ec558db46e4f9e1d8ba9"
 SRC_URI[sha256sum] = "ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1"
 S = "${WORKDIR}/sip-${PV}/sipgen"
+PR = "r1"
 
-inherit qt4x11 native python-dir
+inherit qmake2 native python-dir
 
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"