[oe-commits] org.oe.dev sip: upgrade to 4.7.1, catch up with sip3/sip4 renaming

[mickeyl commit]

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

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6acd361710548f85fc2d6e3a3e43d953aa148980
ViewMTN: http://monotone.openembedded.org/revision/info/6acd361710548f85fc2d6e3a3e43d953aa148980
Files:
1
packages/sip/sip-native_4.7.bb
packages/sip/sip-native_4.7.1.bb
classes/sip.bbclass
Diffs:

#
# mt diff -r48e3d8ce0c21c80e6e929a3a992826251eed2f4d -r6acd361710548f85fc2d6e3a3e43d953aa148980
#
# 
# 
# rename "packages/sip/sip-native_4.7.bb"
#     to "packages/sip/sip-native_4.7.1.bb"
# 
# patch "classes/sip.bbclass"
#  from [4012d4828567e24b5d46a88b61b5f951b18ae7f3]
#    to [a9ed0b070fecb4888c0a73be816865c0285ba605]
# 
# patch "packages/sip/sip-native_4.7.1.bb"
#  from [ffb9c2a06301e9a83d6937e2920959e47eda7f25]
#    to [6b5151de537d212e9876f8f80461628cffaa2040]
# 
============================================================
--- classes/sip.bbclass	4012d4828567e24b5d46a88b61b5f951b18ae7f3
+++ classes/sip.bbclass	a9ed0b070fecb4888c0a73be816865c0285ba605
@@ -1,9 +1,11 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey at 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, \
============================================================
--- packages/sip/sip-native_4.7.bb	ffb9c2a06301e9a83d6937e2920959e47eda7f25
+++ packages/sip/sip-native_4.7.1.bb	6b5151de537d212e9876f8f80461628cffaa2040
@@ -8,7 +8,7 @@ S = "${WORKDIR}/sip-${PV}/sipgen"
 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_stage() {
 }
 
 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