[oe-commits] org.oe.dev merge of '16117855ab79f990564455eee9d420e472e6ab44'

[koen commit]

merge of '16117855ab79f990564455eee9d420e472e6ab44'
     and 'a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d73006a33d6286f7506fbf07c816c81e2e9c215c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d73006a33d6286f7506fbf07c816c81e2e9c215c
Files:
1
packages/webkit/webkit_svn.bb
packages/linux/linux-gta01.inc
Diffs:

#
# mt diff -r16117855ab79f990564455eee9d420e472e6ab44 -rd73006a33d6286f7506fbf07c816c81e2e9c215c
#
# 
# 
# patch "packages/webkit/webkit_svn.bb"
#  from [bbb916009acac2f2a22be48b262a253ab07a9088]
#    to [2a5fcb37237fbc5d9d76134e97ba8b23dcfe8948]
# 
============================================================
--- packages/webkit/webkit_svn.bb	bbb916009acac2f2a22be48b262a253ab07a9088
+++ packages/webkit/webkit_svn.bb	2a5fcb37237fbc5d9d76134e97ba8b23dcfe8948
@@ -27,7 +27,7 @@ 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 -spec ${QMAKESPEC} -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 WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
 }
 
 do_compile_prepend() {
@@ -44,11 +44,20 @@ do_install() {
 	install -d ${D}${libdir}/pkgconfig
 
 	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
-	cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir} 
-	cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ || true
+        cd ${S}/WebKitBuilds/Debug
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+        oe_runmake install
 }
 
 
+do_stage() {
+        install -d ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}
+        cd ${S}/WebKitBuilds/Debug
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
+        oe_runmake install
+}
+
 PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
 
 FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"


#
# mt diff -ra4e4bdd6c9f1532c72e89559a85e2a3c12d161b5 -rd73006a33d6286f7506fbf07c816c81e2e9c215c
#
# 
# 
# patch "packages/linux/linux-gta01.inc"
#  from [3a7770395578a216ea4cae48cbad1a35cdcb367e]
#    to [b9cd2d85a96c0356b675190788e767d1e96ca9c5]
# 
============================================================
--- packages/linux/linux-gta01.inc	3a7770395578a216ea4cae48cbad1a35cdcb367e
+++ packages/linux/linux-gta01.inc	b9cd2d85a96c0356b675190788e767d1e96ca9c5
@@ -62,7 +62,7 @@ do_configure() {
 
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
-	if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+	if [ "${TARGET_OS}" = "linux-gnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
 		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
 	else