From b2a26894b6e920d149c295f1e3de2926cd4b2b2c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 2 Sep 2007 11:07:13 +0000
Subject: sip.bbclass: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2648 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/classes/sip.bbclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'meta')

diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index adf179b13..a258fda62 100644
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -1,11 +1,11 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
 #
-
-DEPENDS =+ "sip-native python-sip"
+DEPENDS  =+ "sip-native"
+RDEPENDS += "python-sip"
 
 # default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
 
 sip_do_generate() {
 	if [ -z "${SIP_MODULES}" ]; then 
@@ -33,10 +33,10 @@ sip_do_generate() {
 
 	for module in $MODULES
 	do
-        	install -d ${module}/
-		oenote "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}"
+		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 \
+			sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
 		cat ${module}/${module}.sbf 	| sed s,target,TARGET, \
 						| sed s,sources,SOURCES, \
 						| sed s,headers,HEADERS, \
-- 
cgit v1.2.3