diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
| commit | 7bcf4828673040af5022534981de6416f5884cff (patch) | |
| tree | 18ab00a9b6f1ce29fa7b613662e256785fb59781 /classes/sip.bbclass | |
| parent | 84b2b31930881004a73267cf24fe6fe701e0f8a8 (diff) | |
| parent | 78c32ad25a3883dc7a127a36673890225f9f54f2 (diff) | |
propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)
to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)
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, \ |