summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-12-07 18:02:40 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-12-07 18:02:40 +0000
commite6b479c3962de0384de434ffb082d84a86d278cd (patch)
treede4f72445fe9a511ecfa232eb7a151b171028912
parentaa521e3dd6346fec0ed6f4f2fc0d910cf0186ff8 (diff)
downloadpoky-e6b479c3962de0384de434ffb082d84a86d278cd.tar.gz
webkit: fixes to get r28485 built
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3320 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/webkit/files/WebKit.pri5
-rw-r--r--meta/packages/webkit/webkit.inc8
2 files changed, 11 insertions, 2 deletions
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri
index 0c47afe7fd..514023de57 100644
--- a/meta/packages/webkit/files/WebKit.pri
+++ b/meta/packages/webkit/files/WebKit.pri
@@ -33,7 +33,10 @@ gtk-port:INCLUDEPATH += \
33 $$BASE_DIR/WebCore/loader/gtk \ 33 $$BASE_DIR/WebCore/loader/gtk \
34 $$BASE_DIR/WebCore/page/gtk \ 34 $$BASE_DIR/WebCore/page/gtk \
35 $$BASE_DIR/WebKit/gtk/Api \ 35 $$BASE_DIR/WebKit/gtk/Api \
36 $$BASE_DIR/WebKit/gtk/WebCoreSupport 36 $$BASE_DIR/WebKit/gtk/WebView \
37 $$BASE_DIR/WebKit/gtk/WebCoreSupport \
38 $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
39 $$BASE_DIR
37INCLUDEPATH += \ 40INCLUDEPATH += \
38 $$BASE_DIR/JavaScriptCore/ \ 41 $$BASE_DIR/JavaScriptCore/ \
39 $$BASE_DIR/JavaScriptCore/kjs \ 42 $$BASE_DIR/JavaScriptCore/kjs \
diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc
index 2ff61091c3..81c2d91bf8 100644
--- a/meta/packages/webkit/webkit.inc
+++ b/meta/packages/webkit/webkit.inc
@@ -34,7 +34,13 @@ do_configure() {
34do_compile_prepend() { 34do_compile_prepend() {
35 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ 35 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
36 cd ${S}/JavaScriptCore/pcre 36 cd ${S}/JavaScriptCore/pcre
37 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf 37 if test -e dftables.c
38 then
39 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
40 elif test -e dftables.cpp
41 then
42 ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
43 fi
38 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ 44 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
39 cd ${S}/WebKitBuilds/Debug 45 cd ${S}/WebKitBuilds/Debug
40} 46}