diff options
Diffstat (limited to 'meta/recipes-sato/web/web-webkit')
-rw-r--r-- | meta/recipes-sato/web/web-webkit/link-with-g++.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch new file mode 100644 index 0000000000..50d6e93792 --- /dev/null +++ b/meta/recipes-sato/web/web-webkit/link-with-g++.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | The main webkit library links against stdc++ so we need to use g++ for | ||
2 | linking. The easiest way to achieve this is to add a dummy cpp file. | ||
3 | This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset. | ||
4 | |||
5 | RP - 14/4/08 | ||
6 | --- webkit.orig/src/Makefile.am | ||
7 | +++ webkit/src/Makefile.am | ||
8 | @@ -1,11 +1,11 @@ | ||
9 | AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" | ||
10 | AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS) | ||
11 | |||
12 | bin_PROGRAMS = web2 | ||
13 | |||
14 | -web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h | ||
15 | +web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp | ||
16 | web2_LDADD = $(WEB_LIBS) | ||
17 | |||
18 | MAINTAINERCLEANFILES = config.h.in Makefile.in | ||
19 | |||
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 | |||