diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-19 12:39:46 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-19 12:39:46 +0000 |
| commit | 18215b5eb4195eccf9b8257805948aa9a9344c96 (patch) | |
| tree | 0c73d25237e0bfe91cc64315ae35187ed715ea37 /classes | |
| parent | 944a05fb7320ce45e14e6af46904c3ab08ea0dca (diff) | |
| parent | 97f96962e8c3e621dbc15936ab8cbcc2a8c84a33 (diff) | |
merge of '1f413a8fc168cbef64fe984af210e9d998cc3382'
and '29d2dfa77e02cc2f8721d7954eb27c061486b2f4'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/sip.bbclass | 14 | ||||
| -rw-r--r-- | classes/sip3.bbclass (renamed from classes/sip4.bbclass) | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/classes/sip.bbclass b/classes/sip.bbclass index adf179b130..a258fda629 100644 --- a/classes/sip.bbclass +++ b/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, \ diff --git a/classes/sip4.bbclass b/classes/sip3.bbclass index ca2b1dae20..1dd42ba86b 100644 --- a/classes/sip4.bbclass +++ b/classes/sip3.bbclass @@ -1,13 +1,13 @@ # Build Class for Sip based Python Bindings # (C) Michael 'Mickey' Lauer <mickey@Vanille.de> # -DEPENDS =+ "sip4-native" -RDEPENDS += "python-sip4" + +DEPENDS =+ "sip-native python-sip" # default stuff, do not uncomment -# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1" +# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -sip4_do_generate() { +sip3_do_generate() { if [ -z "${SIP_MODULES}" ]; then MODULES="`ls sip/*mod.sip`" else @@ -33,10 +33,10 @@ sip4_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 \ - sip/${module}/${module}mod.sip || die "Error calling sip on ${module}" + 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}" cat ${module}/${module}.sbf | sed s,target,TARGET, \ | sed s,sources,SOURCES, \ | sed s,headers,HEADERS, \ |