[oe-commits] org.oe.dev webkit: unbreak qmake usage a bit

[koen commit]

webkit: unbreak qmake usage a bit

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 202111bb61d911d344b28edb3efaa90dd7b5839c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=202111bb61d911d344b28edb3efaa90dd7b5839c
Files:
1
packages/webkit/webkit_svn.bb
Diffs:

#
# mt diff -rd355cc8d988e0476f885987030dc5cdc1fc2614e -r202111bb61d911d344b28edb3efaa90dd7b5839c
#
# 
# 
# patch "packages/webkit/webkit_svn.bb"
#  from [7ae0bcc4ff57753036a08d085d32f9a4b7e841e9]
#    to [2b1fc7e808ad91f7063cccadd98dc020f93440ca]
# 
============================================================
--- packages/webkit/webkit_svn.bb	7ae0bcc4ff57753036a08d085d32f9a4b7e841e9
+++ packages/webkit/webkit_svn.bb	2b1fc7e808ad91f7063cccadd98dc020f93440ca
@@ -1,4 +1,4 @@
-DEPENDS = "flex-native icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo gtk+"
+DEPENDS = "flex-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
@@ -22,14 +22,13 @@ S = "${WORKDIR}/"
 S = "${WORKDIR}/"
 
 
-do_configure() {
-        qmake2 CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
+do_configure_append() {
+        qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
 	mkdir -p WebKitBuilds/Debug
 	cd WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro
 }
 
-do_compile() {
+do_compile_prepend() {
         cd ${S}/WebKitBuilds/Debug
-	oe_runmake
 }