summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-17 10:51:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:20 -0800
commitd5e4f5d7447c295cab80cdde7d3db309921c8045 (patch)
treeaef3f5e7756d1ef46c0f064b89b996a505a423b6 /meta
parent5ba79ef7054001fcabe96a92b24c703214da91fc (diff)
downloadpoky-d5e4f5d7447c295cab80cdde7d3db309921c8045.tar.gz
webkit-gtk: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Removed AM_PROG_CC_STDC. AC_PROG_CC to replace it was already present. (From OE-Core rev: fd3586cfa620299ba2544ce16e140956b5171ae5) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb3
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..d9e8444815
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac
5--- webkit-1.8.3/configure.ac 2012-08-20 19:35:38.000000000 +0300
6+++ webkit-1.8.3/configure.ac 2013-02-08 11:55:28.403397789 +0200
7@@ -111,7 +111,6 @@
8
9 AC_PROG_CC
10 AC_PROG_CXX
11-AM_PROG_CC_STDC
12 AM_PROG_CC_C_O
13 AC_PROG_INSTALL
14 AC_SYS_LARGEFILE
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 66a30f8778..377b06ceac 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" 8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
9 9
10PR = "r0" 10PR = "r1"
11 11
12# Choice of language backends - icu has issues on Big Endian machines so use pango 12# Choice of language backends - icu has issues on Big Endian machines so use pango
13ICU_LIB = "icu" 13ICU_LIB = "icu"
@@ -23,6 +23,7 @@ SRC_URI = "\
23 file://no-gtkdoc.patch \ 23 file://no-gtkdoc.patch \
24 file://webgit-gtk_fix_build_with_automake_1.12.patch \ 24 file://webgit-gtk_fix_build_with_automake_1.12.patch \
25 file://bison-2.6.patch \ 25 file://bison-2.6.patch \
26 file://obsolete_automake_macros.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" 29SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"