summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-03-30 19:21:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-04 16:17:52 (GMT)
commit6228ba684841dfcea1f0a3b2c63bdeaf568e3cdd (patch)
tree2f1e600165a60ab1a6e3dbcf31f06e034126f4dd /meta/recipes-sato
parent0aaddbc32b7d125ea754aecfd503ce96fe6e1d0b (diff)
downloadpoky-6228ba684841dfcea1f0a3b2c63bdeaf568e3cdd.tar.gz
webkit: Fix build with gcc-4.7
Include unistd.h for all linux and not just for android. (From OE-Core rev: c870606c9da2fa90df2cd7c4a198e3bf5340304b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/files/function-scope.patch21
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/files/function-scope.patch b/meta/recipes-sato/webkit/files/function-scope.patch
new file mode 100644
index 0000000..a20a805
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/function-scope.patch
@@ -0,0 +1,21 @@
1we need to include unistd.h on all linux platforms therefore
2extend the conditional inclusion accordingly
3
4This gets proper declation of sleep() into the source file
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
10===================================================================
11--- webkit-gtk-1.7.2+svnr101488-r3.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:11:04.912613223 -0700
12+++ webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:14:21.840622752 -0700
13@@ -29,7 +29,7 @@
14 #include <assert.h>
15 #include <string.h>
16
17-#if defined(ANDROID)
18+#if defined(__linux__)
19 #include <unistd.h>
20 #endif
21
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 9181c2c..7db573d 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -15,7 +15,7 @@ SRCREV_FORMAT = "source"
15 15
16SRCREV = "101488" 16SRCREV = "101488"
17PV = "1.7.2+svnr${SRCPV}" 17PV = "1.7.2+svnr${SRCPV}"
18PR = "r3" 18PR = "r4"
19 19
20SRC_URI = "\ 20SRC_URI = "\
21 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ 21 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -28,6 +28,7 @@ SRC_URI = "\
28 file://GNUmakefile.am \ 28 file://GNUmakefile.am \
29 file://gtk-doc.make \ 29 file://gtk-doc.make \
30 file://nodolt.patch \ 30 file://nodolt.patch \
31 file://function-scope.patch \
31 " 32 "
32 33
33S = "${WORKDIR}/" 34S = "${WORKDIR}/"