diff options
Diffstat (limited to 'meta/packages/web/web-webkit')
-rw-r--r-- | meta/packages/web/web-webkit/link-with-g++.patch | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/meta/packages/web/web-webkit/link-with-g++.patch b/meta/packages/web/web-webkit/link-with-g++.patch index 946d950cfd..50d6e93792 100644 --- a/meta/packages/web/web-webkit/link-with-g++.patch +++ b/meta/packages/web/web-webkit/link-with-g++.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | --- | 1 | The main webkit library links against stdc++ so we need to use g++ for |
2 | src/Makefile.am | 2 +- | 2 | linking. The easiest way to achieve this is to add a dummy cpp file. |
3 | 1 file changed, 1 insertion(+), 1 deletion(-) | 3 | This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset. |
4 | 4 | ||
5 | RP - 14/4/08 | ||
5 | --- webkit.orig/src/Makefile.am | 6 | --- webkit.orig/src/Makefile.am |
6 | +++ webkit/src/Makefile.am | 7 | +++ webkit/src/Makefile.am |
7 | @@ -1,11 +1,11 @@ | 8 | @@ -1,11 +1,11 @@ |
@@ -17,3 +18,15 @@ | |||
17 | MAINTAINERCLEANFILES = config.h.in Makefile.in | 18 | MAINTAINERCLEANFILES = config.h.in Makefile.in |
18 | 19 | ||
19 | uidir = $(pkgdatadir) | 20 | uidir = $(pkgdatadir) |
21 | Index: webkit/configure.ac | ||
22 | =================================================================== | ||
23 | --- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100 | ||
24 | +++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100 | ||
25 | @@ -7,6 +7,7 @@ | ||
26 | |||
27 | AC_ISC_POSIX | ||
28 | AC_PROG_CC | ||
29 | +AC_PROG_CXX | ||
30 | AC_STDC_HEADERS | ||
31 | AC_PROG_LIBTOOL | ||
32 | |||