diff options
| author | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-13 15:28:42 +0000 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-13 15:28:42 +0000 |
| commit | fe379ffc9b1b75ba62a68f5bc21b854e5da49259 (patch) | |
| tree | 312e1b5003b9ef65e718b145052d447f2f8e2653 /classes/sip.bbclass | |
| parent | 8a2fba6940e3e07bc7613a431c99a6b7ed433588 (diff) | |
| parent | f4a7dac492fabd4f30dcad003cdcabdf6684e39e (diff) | |
merge of 'ad95f08d419bba954eab21c0d4ef155b70f86dbc'
and 'eeb3a83ad8d45d4069e1ae9170eb852a6bb31d43'
Diffstat (limited to 'classes/sip.bbclass')
| -rw-r--r-- | classes/sip.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/classes/sip.bbclass b/classes/sip.bbclass index a258fda629..6f77f460dc 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -1,8 +1,10 @@ # Build Class for Sip based Python Bindings # (C) Michael 'Mickey' Lauer <mickey@Vanille.de> # -DEPENDS =+ "sip-native" -RDEPENDS += "python-sip" + +# yes, python-sip is actually a build-time dependency, since +# the recipe installs sip.h +DEPENDS =+ "sip-native python-sip" # default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0" @@ -34,8 +36,8 @@ sip_do_generate() { for module in $MODULES do install -d ${module}/ - echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" - sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \ + echo "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" + sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \ sip/${module}/${module}mod.sip || die "Error calling sip on ${module}" cat ${module}/${module}.sbf | sed s,target,TARGET, \ | sed s,sources,SOURCES, \ |