summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-03 18:09:39 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-03 18:09:39 +0000
commit1dc1601f6538dfef2cc2faae3d79f3a4f9a03628 (patch)
treedb7b8e31c9cf98a9c42a35cb4483ee6cfe86a085 /meta
parentaa820102c854fc2be9d9fe58b12611e0b5acea54 (diff)
downloadpoky-1dc1601f6538dfef2cc2faae3d79f3a4f9a03628.tar.gz
expat: Upgrade native/sdk versions to 2.0.0, use BBCLASSEXTEND, drop 1.95.7 version, clean up recipe massively
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/expat/expat-1.95.7/autotools.patch13
-rw-r--r--meta/packages/expat/expat-native_1.95.7.bb2
-rw-r--r--meta/packages/expat/expat-sdk_1.95.7.bb2
-rw-r--r--meta/packages/expat/expat.inc4
-rw-r--r--meta/packages/expat/expat_1.95.7.bb24
-rw-r--r--meta/packages/expat/expat_2.0.0.bb20
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 @@
1--- expat-1.95.7/configure.in~autotools 2004-05-13 22:46:28.000000000 -0400
2+++ expat-1.95.7/configure.in 2004-05-13 22:46:39.000000000 -0400
3@@ -50,9 +50,7 @@
4
5 AC_CONFIG_HEADER(expat_config.h)
6
7-sinclude(conftools/libtool.m4)
8-sinclude(conftools/ac_c_bigendian_cross.m4)
9-
10+
11 AC_LIBTOOL_WIN32_DLL
12 AC_PROG_LIBTOOL
13
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 @@
1require expat_${PV}.bb
2inherit 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 @@
1require expat_${PV}.bb
2inherit 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"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ 6SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
7 " 7 "
8S = "${WORKDIR}/expat-${PV}"
9
10export LTCC = "${CC}" 8export LTCC = "${CC}"
11 9
12inherit autotools 10inherit autotools_stage
13 11
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 @@
1require expat.inc
2PR = "r1"
3
4SRC_URI += "file://autotools.patch;patch=1"
5
6inherit lib_package
7
8do_configure () {
9 rm -f ${S}/conftools/libtool.m4
10 autotools_do_configure
11}
12
13do_stage () {
14 install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
15 oe_libinstall -so libexpat ${STAGING_LIBDIR}
16}
17
18do_install () {
19 oe_runmake prefix="${D}${prefix}" \
20 bindir="${D}${bindir}" \
21 libdir="${D}${libdir}" \
22 includedir="${D}${includedir}" \
23 install
24}
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 @@
1require expat.inc 1require expat.inc
2PR = "r2" 2PR = "r3"
3 3
4SRC_URI += "file://autotools.patch;patch=1" 4SRC_URI += "file://autotools.patch;patch=1"
5 5
6inherit lib_package 6inherit lib_package
7 7
8do_configure() { 8do_configure_prepend () {
9 rm -f ${S}/conftools/libtool.m4 9 rm -f ${S}/conftools/libtool.m4
10 touch ${S}/conftools/libtool.m4 10 touch ${S}/conftools/libtool.m4
11 autotools_do_configure
12} 11}
13 12
14do_stage() { 13BBCLASSEXTEND = "native sdk"
15 install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
16 install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
17 oe_libinstall -so libexpat ${STAGING_LIBDIR}
18}
19
20do_install() {
21 oe_runmake prefix="${D}${prefix}" \
22 bindir="${D}${bindir}" \
23 libdir="${D}${libdir}" \
24 includedir="${D}${includedir}" \
25 man1dir="${D}${mandir}/man1" \
26 install
27}