summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-26 17:26:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 14:29:29 +0100
commit4343662a04a92021c306a17f7eb8ed535425462f (patch)
tree7aa88675efe71dde29a3f3601870dbaafc33515f
parent12f5b06fe4fe93ec95d76a7c62cd4e6af7c38b80 (diff)
downloadpoky-4343662a04a92021c306a17f7eb8ed535425462f.tar.gz
web-webkit: don't link using g++, it's not needed anymore
(From OE-Core rev: cd9a97c063a6c58b022d95ca9de8bcce784f1d3a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/web/web-webkit/link-with-g++.patch35
-rw-r--r--meta/recipes-sato/web/web-webkit_git.bb9
2 files changed, 2 insertions, 42 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
deleted file mode 100644
index e0c678457a..0000000000
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1The main webkit library links against stdc++ so we need to use g++ for
2linking. The easiest way to achieve this is to add a dummy cpp file.
3This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
4
5RP - 14/4/08
6
7Upstream-Status: Inappropriate [configuration]
8
9--- webkit.orig/src/Makefile.am
10+++ webkit/src/Makefile.am
11@@ -1,11 +1,11 @@
12 AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\"
13 AM_CFLAGS = -Wall -export-dynamic $(WEB_CFLAGS)
14
15 bin_PROGRAMS = web2
16
17-web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h
18+web2_SOURCES = web2.h web2-main.c web2-utils.c web2-utils.h dummy.cpp
19 web2_LDADD = $(WEB_LIBS)
20
21 MAINTAINERCLEANFILES = config.h.in Makefile.in
22
23 uidir = $(pkgdatadir)
24Index: webkit/configure.ac
25===================================================================
26--- webkit.orig/configure.ac 2008-04-14 22:15:25.000000000 +0100
27+++ webkit/configure.ac 2008-04-14 22:16:31.000000000 +0100
28@@ -7,6 +7,7 @@
29
30 AC_ISC_POSIX
31 AC_PROG_CC
32+AC_PROG_CXX
33 AC_STDC_HEADERS
34 AC_PROG_LIBTOOL
35
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index dae7faf6da..0c79324791 100644
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -13,10 +13,9 @@ RRECOMMENDS_${PN} += "glib-networking"
13 13
14SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503" 14SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
15PV = "0.1+git${SRCPV}" 15PV = "0.1+git${SRCPV}"
16PR = "r1" 16PR = "r2"
17 17
18SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 18SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
19 file://link-with-g++.patch"
20 19
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
22 21
@@ -24,8 +23,4 @@ EXTRA_OECONF = "--enable-libowl"
24 23
25inherit autotools pkgconfig 24inherit autotools pkgconfig
26 25
27do_configure_prepend() {
28 touch ${S}/src/dummy.cpp
29}
30
31FILES_${PN} += "${datadir}/web2" 26FILES_${PN} += "${datadir}/web2"