[oe-commits] Khem Raj : openjade: Remove legacy staging.

[git version control]

Module: openembedded.git
Branch: master
Commit: fdf02c61607acb5046afaa11c5c682ab99f4d508
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fdf02c61607acb5046afaa11c5c682ab99f4d508

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Oct  9 23:46:53 2010 -0700

openjade: Remove legacy staging.

* Use BBCLASSEXTEND to implement native recipe

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/openjade/openjade-native_1.3.2.bb |   53 -----------------------------
 recipes/openjade/openjade_1.3.2.bb        |   36 +++++++++++++++----
 2 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/recipes/openjade/openjade-native_1.3.2.bb b/recipes/openjade/openjade-native_1.3.2.bb
deleted file mode 100644
index 20e96ab..0000000
--- a/recipes/openjade/openjade-native_1.3.2.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SECTION = "unknown"
-DEPENDS = "opensp-native sgml-common-native"
-LICENSE = "MIT"
-SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
-	   file://configure.patch \
-	   file://oj-native-libosp-fix.patch"
-S = "${WORKDIR}/openjade-${PV}"
-
-inherit autotools native
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openjade-${PV}"
-PACKAGES = ""
-
-EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
-                --enable-splibdir=${STAGING_LIBDIR} \
-		--enable-default-catalog=${sysconfdir}/sgml/catalog \
-		--enable-default-search-path=${datadir}/sgml"
-
-acpaths = "-I ${S}/config"
-
-# Trailing whitespace is important. Otherwise compiler arguments will be messed
-# up, resulting in a fail in do_configure.
-CFLAGS_prepend = "-I${S}/include "
-
-do_configure () {
-	mv config/configure.in .
-	gnu-configize
-	oe_runconf
-}
-
-do_stage () {
-	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
-	# for details.
-	install -m 0755 ${S}/jade/.libs/openjade ${STAGING_BINDIR_NATIVE}/openjade
-	ln -sf openjade ${STAGING_BINDIR_NATIVE}/jade
-
-	oe_libinstall -a -so -C style libostyle ${STAGING_LIBDIR}
-	oe_libinstall -a -so -C spgrove libospgrove ${STAGING_LIBDIR}
-	oe_libinstall -a -so -C grove libogrove ${STAGING_LIBDIR}
-	
-  install -d ${STAGING_DATADIR}/sgml/openjade-${PV}
-	install -m 644 dsssl/catalog ${STAGING_DATADIR}/sgml/openjade-${PV}
-	install -m 644 dsssl/*.{dtd,dsl,sgm} ${STAGING_DATADIR}/sgml/openjade-${PV}
-	
-	install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \
-	    ${STAGING_DATADIR}/sgml/openjade-${PV}/catalog
-	    
-	install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
-	    ${sysconfdir}/sgml/openjade-${PV}.cat
-}
-
-SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
-SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"
diff --git a/recipes/openjade/openjade_1.3.2.bb b/recipes/openjade/openjade_1.3.2.bb
index 547ca5f..238586b 100644
--- a/recipes/openjade/openjade_1.3.2.bb
+++ b/recipes/openjade/openjade_1.3.2.bb
@@ -5,9 +5,10 @@ DESCRIPTION = "OpenJade is a suite of tools for validating, \
 processing, and applying DSSSL (Document Style Semantics and \
 Specification Language) stylesheets to SGML and XML documents."
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
-	   file://configure.patch"
+	   file://configure.patch \
+          "
 
 inherit autotools
 
@@ -20,15 +21,34 @@ acpaths = "-I ${S}/config"
 # up, resulting in a fail in do_configure.
 CFLAGS_prepend = "-I${S}/include "
 
-do_configure_prepend () {
-        mv config/configure.in .
+do_configure () {
+       cp config/configure.in .
+       cp config/aclocal.m4 .
+       gnu-configize
+       oe_runconf
 }
+do_install_append () {
+       # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
+       # for details.
+       install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade
+       ln -sf openjade ${D}${bindir}/jade
 
-do_stage () {
-	oe_libinstall -a -so -C style libostyle ${STAGING_LIBDIR}
-	oe_libinstall -a -so -C spgrove libospgrove ${STAGING_LIBDIR}
-	oe_libinstall -a -so -C grove libogrove ${STAGING_LIBDIR}
+       oe_libinstall -a -so -C style libostyle ${D}${libdir}
+       oe_libinstall -a -so -C spgrove libospgrove ${D}${libdir}
+       oe_libinstall -a -so -C grove libogrove ${D}${libdir}
+
+       install -d ${D}${datadir}/sgml/openjade-${PV}
+       install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV}
+       install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV}
+
+       install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \
+           ${D}${datadir}/sgml/openjade-${PV}/catalog
+
+       install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
+           ${sysconfdir}/sgml/openjade-${PV}.cat
 }
 
+BBCLASSEXTEND = "native"
+
 SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
 SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"