gtk-webcore: work around libtool breakage causing stuff to be linked against libstdc++. if someone has a proper fix please let me know

BKrev: 4182c5f8thL0lUFwLkUM2gLE8x9GwQ

3 files changed, 71 insertions, 0 deletions

diff --git a/gtk-webcore/osb-jscore_0.5.0.oe b/gtk-webcore/osb-jscore_0.5.0.oe
index e69de29bb2..7c80752b36 100644
--- a/gtk-webcore/osb-jscore_0.5.0.oe
+++ b/gtk-webcore/osb-jscore_0.5.0.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "Gtk+ WebCore - JavaScriptCore"
+HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "gpe"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-jscore-${PV}.tar.gz \
+           file://missing-includes.patch;patch=1"
+
+inherit autotools pkgconfig
+
+do_configure () {
+	autotools_do_configure
+	cd ${S}
+
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat arm-linux-libtool | sed -e 's/postdeps=".*"/postdeps=""/' > arm-linux-libtool.tmp
+	mv arm-linux-libtool.tmp arm-linux-libtool
+}
+
+do_stage () {
+	oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+	
+	install -d ${STAGING_INCDIR}/osb/JavaScriptCore
+	for i in ${S}/kjs/*.h ${S}/kjs/new; do
+		install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore
+	done
+}
diff --git a/gtk-webcore/osb-nrcit_0.5.0.oe b/gtk-webcore/osb-nrcit_0.5.0.oe
index e69de29bb2..5045b1faa0 100644
--- a/gtk-webcore/osb-nrcit_0.5.0.oe
+++ b/gtk-webcore/osb-nrcit_0.5.0.oe
@@ -0,0 +1,30 @@
+DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component"
+HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+DEPENDS = "curl osb-nrcore"
+SECTION = "gpe"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcit-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_configure () {
+	autotools_do_configure
+	cd ${S}
+
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat arm-linux-libtool | sed -e 's/postdeps=".*"/postdeps=""/' > arm-linux-libtool.tmp
+	mv arm-linux-libtool.tmp arm-linux-libtool
+}
+
+do_stage () {
+	oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+	
+	install -d ${STAGING_INCDIR}/osb
+	install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb
+	install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb
+}
diff --git a/gtk-webcore/osb-nrcore_0.5.0.oe b/gtk-webcore/osb-nrcore_0.5.0.oe
index c1c3f102c6..9c90eee0ee 100644
--- a/gtk-webcore/osb-nrcore_0.5.0.oe
+++ b/gtk-webcore/osb-nrcore_0.5.0.oe
@@ -4,6 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
 SECTION = "gpe"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcore-${PV}.tar.gz \
            file://KWQDictImpl.patch;patch=1"
@@ -12,6 +13,15 @@ LEAD_SONAME = "libnrcore.so"
 
 inherit autotools pkgconfig
 
+do_configure () {
+	autotools_do_configure
+	cd ${S}
+
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat arm-linux-libtool | sed -e 's/postdeps=".*"/postdeps=""/' > arm-linux-libtool.tmp
+	mv arm-linux-libtool.tmp arm-linux-libtool
+}
+
 do_stage () {
 	oe_libinstall -so libnrcore ${STAGING_LIBDIR}
 	oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}