summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-02 11:07:13 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-02 11:07:13 +0000
commitb2a26894b6e920d149c295f1e3de2926cd4b2b2c (patch)
treeea06bb4cd105cf0dd28e8686ee29633dc6461b83 /meta/classes
parentbc4750318ea0e0e23dbe75b66330078de67bb53e (diff)
downloadpoky-b2a26894b6e920d149c295f1e3de2926cd4b2b2c.tar.gz
sip.bbclass: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2648 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sip.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index adf179b130..a258fda629 100644
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -1,11 +1,11 @@
1# Build Class for Sip based Python Bindings 1# Build Class for Sip based Python Bindings
2# (C) Michael 'Mickey' Lauer <mickey@Vanille.de> 2# (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
3# 3#
4 4DEPENDS =+ "sip-native"
5DEPENDS =+ "sip-native python-sip" 5RDEPENDS += "python-sip"
6 6
7# default stuff, do not uncomment 7# default stuff, do not uncomment
8# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" 8# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
9 9
10sip_do_generate() { 10sip_do_generate() {
11 if [ -z "${SIP_MODULES}" ]; then 11 if [ -z "${SIP_MODULES}" ]; then
@@ -33,10 +33,10 @@ sip_do_generate() {
33 33
34 for module in $MODULES 34 for module in $MODULES
35 do 35 do
36 install -d ${module}/ 36 install -d ${module}/
37 oenote "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" 37 echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
38 sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf sip/${module}/${module}mod.sip \ 38 sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
39 || die "Error calling sip on ${module}" 39 sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
40 cat ${module}/${module}.sbf | sed s,target,TARGET, \ 40 cat ${module}/${module}.sbf | sed s,target,TARGET, \
41 | sed s,sources,SOURCES, \ 41 | sed s,sources,SOURCES, \
42 | sed s,headers,HEADERS, \ 42 | sed s,headers,HEADERS, \