diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-31 17:49:33 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-31 17:49:33 +0000 |
| commit | 6f1924f76c01002d2c3b0c603f5b2247af8adecb (patch) | |
| tree | e01687ce33edc5e605926b9b725a8b7e78932b38 /meta | |
| parent | d0dae3b6166027eea33dd03e5fa3a02e35140728 (diff) | |
| download | openembedded-core-6f1924f76c01002d2c3b0c603f5b2247af8adecb.tar.gz openembedded-core-6f1924f76c01002d2c3b0c603f5b2247af8adecb.tar.bz2 openembedded-core-6f1924f76c01002d2c3b0c603f5b2247af8adecb.zip | |
web-webkit: link with g++
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3650 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/web/web-webkit/link-with-g++.patch | 19 | ||||
| -rw-r--r-- | meta/packages/web/web-webkit_svn.bb | 8 |
2 files changed, 26 insertions, 1 deletions
diff --git a/meta/packages/web/web-webkit/link-with-g++.patch b/meta/packages/web/web-webkit/link-with-g++.patch new file mode 100644 index 0000000000..946d950cfd --- /dev/null +++ b/meta/packages/web/web-webkit/link-with-g++.patch @@ -0,0 +1,19 @@ +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- webkit.orig/src/Makefile.am ++++ webkit/src/Makefile.am +@@ -1,11 +1,11 @@ + AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" + AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS) + + bin_PROGRAMS = web2 + +-web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h ++web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp + web2_LDADD = $(WEB_LIBS) + + MAINTAINERCLEANFILES = config.h.in Makefile.in + + uidir = $(pkgdatadir) diff --git a/meta/packages/web/web-webkit_svn.bb b/meta/packages/web/web-webkit_svn.bb index 0ffca7483f..227c86de44 100644 --- a/meta/packages/web/web-webkit_svn.bb +++ b/meta/packages/web/web-webkit_svn.bb @@ -4,11 +4,17 @@ SECTION = "x11" DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl" PV = "0.0+svnr${SRCREV}" +PR = "r1" -SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \ + file://link-with-g++.patch;patch=1" S = "${WORKDIR}/webkit" inherit autotools pkgconfig gconf +do_configure_prepend() { + touch ${S}/src/dummy.cpp +} + FILES_${PN} += "${datadir}/web2" |