Patchwork [CONSOLIDATED,PULL,06/18] web-webkit: don't link using g++, it's not needed anymore

login
register
mail settings
Submitter Saul Wold
Date July 18, 2012, 7:42 a.m.
Message ID <cd9a97c063a6c58b022d95ca9de8bcce784f1d3a.1342597081.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/32371/
State New
Headers show

Comments

Saul Wold - July 18, 2012, 7:42 a.m.
From: Ross Burton <ross.burton@intel.com>

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../web/web-webkit/link-with-g++.patch             |   35 --------------------
 meta/recipes-sato/web/web-webkit_git.bb            |    9 +----
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-sato/web/web-webkit/link-with-g++.patch

Patch

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 e0c6784..0000000
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-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 
-
-Upstream-Status: Inappropriate [configuration]
-
---- 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)
-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/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index dae7faf..0c79324 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"
 
 SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
-           file://link-with-g++.patch"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
 
 S = "${WORKDIR}/git"
 
@@ -24,8 +23,4 @@  EXTRA_OECONF = "--enable-libowl"
 
 inherit autotools pkgconfig
 
-do_configure_prepend() {
-    touch ${S}/src/dummy.cpp
-}
-
 FILES_${PN} += "${datadir}/web2"