[oe-commits] org.oe.dev abiword-plugins: add latest stable, 2.6.0 and patch it to use CXX for LD

[koen commit]

abiword-plugins: add latest stable, 2.6.0 and patch it to use CXX for LD

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2fc8e8fa8e29041f0c726e5d89cbdbcc20473c19
ViewMTN: http://monotone.openembedded.org/revision/info/2fc8e8fa8e29041f0c726e5d89cbdbcc20473c19
Files:
1
packages/abiword/abiword-plugins_2.6.0.bb
packages/abiword/files/abiword-cxx-for-ld-fix.patch
Diffs:

#
# mt diff -re7e96408a59fab12da7980a4c105f51acf84541f -r2fc8e8fa8e29041f0c726e5d89cbdbcc20473c19
#
#
#
# add_file "packages/abiword/abiword-plugins_2.6.0.bb"
#  content [08cb74f7ccc32068a49834d218b474e7f487b3d5]
# 
# add_file "packages/abiword/files/abiword-cxx-for-ld-fix.patch"
#  content [273f436489f287d13297340c5a6475232a4f933e]
#
============================================================
--- packages/abiword/abiword-plugins_2.6.0.bb	08cb74f7ccc32068a49834d218b474e7f487b3d5
+++ packages/abiword/abiword-plugins_2.6.0.bb	08cb74f7ccc32068a49834d218b474e7f487b3d5
@@ -0,0 +1,44 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+	   "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGING_DIR_HOST} \ 
+		 --with-boost-thread=boost_thread-mt \
+               "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
============================================================
--- packages/abiword/files/abiword-cxx-for-ld-fix.patch	273f436489f287d13297340c5a6475232a4f933e
+++ packages/abiword/files/abiword-cxx-for-ld-fix.patch	273f436489f287d13297340c5a6475232a4f933e
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac	2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac	2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+ 
+ AM_INIT_AUTOMAKE
+