sip: upgrade to 4.7.1, catch up with sip3/sip4 renaming

diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index a258fda..6f77f46 100644 (file)
--- 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, \

diff --git a/packages/sip/sip-native_4.7.bb b/packages/sip/sip-native_4.7.1.bb
similarity index 90%
rename from packages/sip/sip-native_4.7.bb
rename to packages/sip/sip-native_4.7.1.bb
index 08cdae4..b47a3a7 100644 (file)
--- a/packages/sip/sip-native_4.7.bb
+++ b/packages/sip/sip-native_4.7.1.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/sipgen"
 
-inherit qmake qt4x11 native
+inherit qt4x11 native
 
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
 
@@ -17,7 +17,7 @@ do_configure_prepend() {
 }
 
 do_stage() {
-       install -m 0755 sip ${STAGING_BINDIR}/sip4
+       install -m 0755 sip ${STAGING_BINDIR_NATIVE}/sip
        cd ${WORKDIR}/sip-${PV} && python configure.py
        install -d ${STAGING_PYDIR}/site-packages
        install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages