diff options
| -rw-r--r-- | meta/packages/web/web-webkit/link-with-g++.patch | 19 | ||||
| -rw-r--r-- | meta/packages/web/web-webkit_svn.bb | 2 |
2 files changed, 17 insertions, 4 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 @@ ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +The main webkit library links against stdc++ so we need to use g++ for +linking. The easiest way to achieve this is to add a dummy cpp file. +This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset. +RP - 14/4/08 --- webkit.orig/src/Makefile.am +++ webkit/src/Makefile.am @@ -1,11 +1,11 @@ @@ -17,3 +18,15 @@ MAINTAINERCLEANFILES = config.h.in Makefile.in uidir = $(pkgdatadir) +Index: webkit/configure.ac +=================================================================== +--- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100 ++++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100 +@@ -7,6 +7,7 @@ + + AC_ISC_POSIX + AC_PROG_CC ++AC_PROG_CXX + AC_STDC_HEADERS + AC_PROG_LIBTOOL + diff --git a/meta/packages/web/web-webkit_svn.bb b/meta/packages/web/web-webkit_svn.bb index e6789c8806..75b3cf0cdf 100644 --- a/meta/packages/web/web-webkit_svn.bb +++ b/meta/packages/web/web-webkit_svn.bb @@ -4,7 +4,7 @@ SECTION = "x11" DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \ file://link-with-g++.patch;patch=1" |