opensp 1.5: Clean up the recipe, fix up packaging and reduce optimisation on

sh4 to avoid internal compiler errors.

diff --git a/packages/opensp/opensp-1.5/fix-docdir.patch b/packages/opensp/opensp-1.5/fix-docdir.patch
new file mode 100644 (file)
index 0000000..4866874
--- /dev/null
+++ b/packages/opensp/opensp-1.5/fix-docdir.patch
@@ -0,0 +1,11 @@
+Index: OpenSP-1.5/doc/Makefile.am
+===================================================================
+--- OpenSP-1.5.orig/doc/Makefile.am    2000-05-06 09:10:32.000000000 +1000
++++ OpenSP-1.5/doc/Makefile.am 2007-06-02 12:46:50.000000000 +1000
+@@ -1,6 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(prefix)/doc
+ pkgdocdir = $(docdir)/@PACKAGE@
+ 
+ MAINTAINERCLEANFILES = Makefile.in

diff --git a/packages/opensp/opensp_1.5.bb b/packages/opensp/opensp_1.5.bb
index de28a5f..839fde5 100644 (file)
--- a/packages/opensp/opensp_1.5.bb
+++ b/packages/opensp/opensp_1.5.bb
@@ -1,22 +1,30 @@
-SECTION = "libs"
 DESCRIPTION = "OpenSP is a library and a set of tools \
 for validating, parsing, and manipulating SGML and \
 XML documents."
+HOMEPAGE = "http://openjade.sourceforge.net/"
+SECTION = "libs"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
+
+# sh4/gcc3.4.4 with -O2 triggers internal compiler errors
+FULL_OPTIMIZATION_sh4 = "-O1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
-          file://m4.patch;patch=1 \
-          file://attributevalue.patch;patch=1 \
-           file://rangmap-fix.patch;patch=1"
+           file://m4.patch;patch=1 \
+           file://attributevalue.patch;patch=1 \
+           file://rangmap-fix.patch;patch=1 \
+           file://fix-docdir.patch;patch=1"
+
 S = "${WORKDIR}/OpenSP-${PV}"
 
 inherit autotools
 
 do_stage () {
-       oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR}
-       install -d ${STAGING_INCDIR}/OpenSP
-       install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/OpenSP/
-       install -m 0644 ${S}/include/*.cxx ${STAGING_INCDIR}/OpenSP/
-       install -m 0644 ${S}/config.h ${STAGING_INCDIR}/OpenSP/config.h
+        oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/OpenSP
+        install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/OpenSP/
+        install -m 0644 ${S}/include/*.cxx ${STAGING_INCDIR}/OpenSP/
+        install -m 0644 ${S}/config.h ${STAGING_INCDIR}/OpenSP/config.h
 }
+
+FILES_${PN} += "${datadir}/OpenSP"