diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-12-15 14:31:21 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 17:36:01 +0000 |
commit | 3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd (patch) | |
tree | 895453c7c0ef3f7be133a17a8cfa3cc9ebb63828 /meta/recipes-sato/web | |
parent | a9ce04f22d7c1791cbab5dbece1785dc0a076860 (diff) | |
download | poky-3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd.tar.gz |
web-webkit: fix for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato/web')
-rw-r--r-- | meta/recipes-sato/web/web-webkit/make-382.patch | 15 | ||||
-rw-r--r-- | meta/recipes-sato/web/web-webkit_svn.bb | 5 |
2 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch new file mode 100644 index 0000000000..253743d18f --- /dev/null +++ b/meta/recipes-sato/web/web-webkit/make-382.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Make 3.82 does not allow 8 spaces instead of a tab | ||
2 | |||
3 | JL - 15/12/10 | ||
4 | |||
5 | Index: webkit/Makefile.am | ||
6 | =================================================================== | ||
7 | --- webkit.orig/Makefile.am | ||
8 | +++ webkit/Makefile.am | ||
9 | @@ -5,5 +5,5 @@ SUBDIRS = src data | ||
10 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing | ||
11 | |||
12 | snapshot: | ||
13 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
14 | + $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
15 | |||
diff --git a/meta/recipes-sato/web/web-webkit_svn.bb b/meta/recipes-sato/web/web-webkit_svn.bb index 9cdf1f9da3..895d49b27f 100644 --- a/meta/recipes-sato/web/web-webkit_svn.bb +++ b/meta/recipes-sato/web/web-webkit_svn.bb | |||
@@ -8,10 +8,11 @@ SECTION = "x11" | |||
8 | DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl" | 8 | DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl" |
9 | 9 | ||
10 | PV = "0.0+svnr${SRCREV}" | 10 | PV = "0.0+svnr${SRCREV}" |
11 | PR = "r2" | 11 | PR = "r3" |
12 | 12 | ||
13 | SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \ | 13 | SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \ |
14 | file://link-with-g++.patch;patch=1" | 14 | file://link-with-g++.patch \ |
15 | file://make-382.patch" | ||
15 | 16 | ||
16 | S = "${WORKDIR}/webkit" | 17 | S = "${WORKDIR}/webkit" |
17 | 18 | ||