expat: Upgrade native/sdk versions to 2.0.0, use BBCLASSEXTEND, drop 1.95.7 version, clean up recipe massively

6 files changed, 4 insertions, 61 deletions

diff --git a/meta/packages/expat/expat-1.95.7/autotools.patch b/meta/packages/expat/expat-1.95.7/autotools.patch
deleted file mode 100644
index f22b2401c8..0000000000
--- a/meta/packages/expat/expat-1.95.7/autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- expat-1.95.7/configure.in~autotools	2004-05-13 22:46:28.000000000 -0400
-+++ expat-1.95.7/configure.in	2004-05-13 22:46:39.000000000 -0400
-@@ -50,9 +50,7 @@
- 
- AC_CONFIG_HEADER(expat_config.h)
- 
--sinclude(conftools/libtool.m4)
--sinclude(conftools/ac_c_bigendian_cross.m4)
--
-+ 
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- 
diff --git a/meta/packages/expat/expat-native_1.95.7.bb b/meta/packages/expat/expat-native_1.95.7.bb
deleted file mode 100644
index 89cf4f41fe..0000000000
--- a/meta/packages/expat/expat-native_1.95.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require expat_${PV}.bb
-inherit native
diff --git a/meta/packages/expat/expat-sdk_1.95.7.bb b/meta/packages/expat/expat-sdk_1.95.7.bb
deleted file mode 100644
index 775695f261..0000000000
--- a/meta/packages/expat/expat-sdk_1.95.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require expat_${PV}.bb
-inherit sdk
diff --git a/meta/packages/expat/expat.inc b/meta/packages/expat/expat.inc
index 6d27b77b19..87fe60614e 100644
--- a/meta/packages/expat/expat.inc
+++ b/meta/packages/expat/expat.inc
@@ -5,9 +5,7 @@ LICENSE = "MIT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
 	  "
-S = "${WORKDIR}/expat-${PV}"
-
 export LTCC = "${CC}"
 
-inherit autotools
+inherit autotools_stage
 
diff --git a/meta/packages/expat/expat_1.95.7.bb b/meta/packages/expat/expat_1.95.7.bb
deleted file mode 100644
index a4dda4dcb6..0000000000
--- a/meta/packages/expat/expat_1.95.7.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require expat.inc
-PR = "r1"
-
-SRC_URI += "file://autotools.patch;patch=1"
-
-inherit lib_package
-
-do_configure () {
-	rm -f ${S}/conftools/libtool.m4
-	autotools_do_configure
-}
-
-do_stage () {
-	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
-	oe_libinstall -so libexpat ${STAGING_LIBDIR}
-}
-
-do_install () {
-	oe_runmake prefix="${D}${prefix}" \
-		bindir="${D}${bindir}" \
-		libdir="${D}${libdir}" \
-		includedir="${D}${includedir}" \
-		install
-}
diff --git a/meta/packages/expat/expat_2.0.0.bb b/meta/packages/expat/expat_2.0.0.bb
index 0fd825ee24..f24619a176 100644
--- a/meta/packages/expat/expat_2.0.0.bb
+++ b/meta/packages/expat/expat_2.0.0.bb
@@ -1,27 +1,13 @@
 require expat.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://autotools.patch;patch=1"
 
 inherit lib_package
 
-do_configure() {
+do_configure_prepend () {
 	rm -f ${S}/conftools/libtool.m4
 	touch ${S}/conftools/libtool.m4
-	autotools_do_configure
 }
 
-do_stage() {
-	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
-	oe_libinstall -so libexpat ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake prefix="${D}${prefix}" \
-		bindir="${D}${bindir}" \
-		libdir="${D}${libdir}" \
-		includedir="${D}${includedir}" \
-		man1dir="${D}${mandir}/man1" \
-		install
-}
+BBCLASSEXTEND = "native sdk"