diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-07-24 12:43:21 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-07-24 12:43:21 +0000 |
| commit | 32812c3db0c4ad73c5f240a4eced1f46f4dfaa70 (patch) | |
| tree | 97aca3a7a707305f170613dc3b6056384f3c0252 | |
| parent | 329202659f144a2fb716d8ccc587ff871b2d899d (diff) | |
webkit: first attempt at fixing the dftables problem (http://bugs.webkit.org/show_bug.cgi?id=14744)
| -rw-r--r-- | packages/webkit/webkit/WebKit.pri | 4 | ||||
| -rw-r--r-- | packages/webkit/webkit/WebKit.pro | 1 | ||||
| -rw-r--r-- | packages/webkit/webkit_svn.bb | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri index 4db63eb54f..0375102a0c 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/webkit/WebKit.pri @@ -28,7 +28,9 @@ gdk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/network/curl \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gdk \ - $$BASE_DIR/WebCore/page/gdk + $$BASE_DIR/WebCore/page/gdk \ + $$BASE_DIR/WebKit/gtk/Api \ + $$BASE_DIR/WebKit/gtk/WebCoreSupport INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/ \ $$BASE_DIR/JavaScriptCore/kjs \ diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro index 712eeadb78..335d11e6e7 100644 --- a/packages/webkit/webkit/WebKit.pro +++ b/packages/webkit/webkit/WebKit.pro @@ -3,7 +3,6 @@ CONFIG += ordered !gdk-port:CONFIG += qt-port qt-port:SUBDIRS += WebKitQt/Plugins SUBDIRS += \ - JavaScriptCore/pcre/dftables.pro \ WebCore \ JavaScriptCore/kjs/testkjs.pro diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb index dd2e8ce6ea..656b2384ac 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit_svn.bb @@ -1,4 +1,4 @@ -DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+" +DEPENDS = "libpcre 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}" @@ -31,7 +31,9 @@ do_configure_append() { } do_compile_prepend() { - cd ${S}/WebKitBuilds/Debug + mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cd ${S}/WebKitBuilds/Debug } do_install() { |