diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-12-03 19:37:52 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-12-03 19:37:52 +0000 |
| commit | ad9de0c6194797da8589d130dbaffa579f2ad5f9 (patch) | |
| tree | 9b6425543e332523294985cf149870163d65abf2 /classes/sip.bbclass | |
| parent | 282088f1ad999b8427ad8acf43021538388afa60 (diff) | |
sip: upgrade to 4.7.1, catch up with sip3/sip4 renaming
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, \ |