diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-25 15:38:14 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-25 15:38:14 +0000 |
| commit | 2d281797eda9dc01a695141e9b2ff163df642046 (patch) | |
| tree | db3c4e640b14d83724c824b68e11b340144ffc02 /packages/webkit | |
| parent | b17f2fdbbf1df6393aee46e1f375b32de5e55a9a (diff) | |
| parent | 2da13ebbe1c7ddae7c77364217bb1cbaddb8fba7 (diff) | |
merge of '92b38b8c6e237f7df0177373a95c59b85ad01087'
and 'd73006a33d6286f7506fbf07c816c81e2e9c215c'
Diffstat (limited to 'packages/webkit')
| -rw-r--r-- | packages/webkit/webkit_svn.bb | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index 656b2384ac..c5f5dcafa7 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit_svn.bb @@ -1,4 +1,4 @@ -DEPENDS = "libpcre flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+" +DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+" # Yes, this is wrong... PV = "0.0+svn${SRCDATE}" @@ -27,12 +27,14 @@ 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() { mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ - cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cd ${S}/JavaScriptCore/pcre + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/WebKitBuilds/Debug } @@ -42,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" |