[OE-core] [PATCH] webkit: Fix build with gcc-4.7
Saul Wold
sgw at linux.intel.com
Wed Apr 4 16:54:05 UTC 2012
On 03/30/2012 12:21 PM, Khem Raj wrote:
> Include unistd.h for all linux and not
> just for android.
>
> Signed-off-by: Khem Raj<raj.khem at gmail.com>
> ---
> .../recipes-sato/webkit/files/function-scope.patch | 21 ++++++++++++++++++++
> meta/recipes-sato/webkit/webkit-gtk_svn.bb | 3 +-
> 2 files changed, 23 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-sato/webkit/files/function-scope.patch
>
> 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 @@
> +we need to include unistd.h on all linux platforms therefore
> +extend the conditional inclusion accordingly
> +
> +This gets proper declation of sleep() into the source file
> +
> +Signed-off-by: Khem Raj<raj.khem at gmail.com>
> +
> +Upstream-Status: Pending
> +Index: webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
> +===================================================================
> +--- webkit-gtk-1.7.2+svnr101488-r3.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:11:04.912613223 -0700
> ++++ webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:14:21.840622752 -0700
> +@@ -29,7 +29,7 @@
> + #include<assert.h>
> + #include<string.h>
> +
> +-#if defined(ANDROID)
> ++#if defined(__linux__)
> + #include<unistd.h>
> + #endif
> +
> 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"
>
> SRCREV = "101488"
> PV = "1.7.2+svnr${SRCPV}"
> -PR = "r3"
> +PR = "r4"
>
> SRC_URI = "\
> svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
> @@ -28,6 +28,7 @@ SRC_URI = "\
> file://GNUmakefile.am \
> file://gtk-doc.make \
> file://nodolt.patch \
> + file://function-scope.patch \
> "
>
> S = "${WORKDIR}/"
Merged this along with the 2 QT patches for gcc to OE-Core
Thanks
Sau!
More information about the Openembedded-core
mailing list