[oe-commits] org.oe.dev webkit: add some qmake magic from zecke to make install and staging work better
koen commit
openembedded-commits at lists.openembedded.org
Wed Jul 25 14:38:38 UTC 2007
webkit: add some qmake magic from zecke to make install and staging work better
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5
Files:
1
packages/webkit/webkit_svn.bb
Diffs:
#
# mt diff -ra89a3c03d59c04f2da8d480d784c8e4372a4cef0 -ra4e4bdd6c9f1532c72e89559a85e2a3c12d161b5
#
#
#
# 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"
More information about the Openembedded-commits
mailing list