summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-03-05 10:05:41 +0000
committerRoss Burton <ross@openedhand.com>2007-03-05 10:05:41 +0000
commit01be89c86dfa809fb256d87a3899aa99cfd969ba (patch)
tree5b79a8204f019243002d2bfcadf523ebb0076664 /meta
parent3351a60de8d80b04da9ce5d7edaeeefb18f16c21 (diff)
downloadpoky-01be89c86dfa809fb256d87a3899aa99cfd969ba.tar.gz
Update to expat 2.0 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1327 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/expat/expat-2.0.0/autotools.patch13
-rw-r--r--meta/packages/expat/expat.inc13
-rw-r--r--meta/packages/expat/expat_1.95.7.bb12
-rw-r--r--meta/packages/expat/expat_2.0.0.bb27
4 files changed, 56 insertions, 9 deletions
diff --git a/meta/packages/expat/expat-2.0.0/autotools.patch b/meta/packages/expat/expat-2.0.0/autotools.patch
new file mode 100644
index 0000000000..77aee3a833
--- /dev/null
+++ b/meta/packages/expat/expat-2.0.0/autotools.patch
@@ -0,0 +1,13 @@
1diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
2--- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600
3+++ expat-2.0.0/configure.in 2006-02-10 19:12:24.000000000 -0600
4@@ -50,9 +50,6 @@
5
6 AC_CONFIG_HEADER(expat_config.h)
7
8-sinclude(conftools/libtool.m4)
9-sinclude(conftools/ac_c_bigendian_cross.m4)
10-
11 AC_LIBTOOL_WIN32_DLL
12 AC_PROG_LIBTOOL
13
diff --git a/meta/packages/expat/expat.inc b/meta/packages/expat/expat.inc
new file mode 100644
index 0000000000..6d27b77b19
--- /dev/null
+++ b/meta/packages/expat/expat.inc
@@ -0,0 +1,13 @@
1DESCRIPTION = "Jim Clarkes XML parser library."
2HOMEPAGE = "http://expat.sf.net/"
3SECTION = "libs"
4LICENSE = "MIT"
5
6SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
7 "
8S = "${WORKDIR}/expat-${PV}"
9
10export LTCC = "${CC}"
11
12inherit autotools
13
diff --git a/meta/packages/expat/expat_1.95.7.bb b/meta/packages/expat/expat_1.95.7.bb
index c3bbb8981b..a4dda4dcb6 100644
--- a/meta/packages/expat/expat_1.95.7.bb
+++ b/meta/packages/expat/expat_1.95.7.bb
@@ -1,15 +1,9 @@
1SECTION = "libs" 1require expat.inc
2DESCRIPTION = "Jim Clarkes XML parser library."
3HOMEPAGE = "http://expat.sourceforge.net/"
4LICENSE = "MIT"
5PR = "r1" 2PR = "r1"
6 3
7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ 4SRC_URI += "file://autotools.patch;patch=1"
8 file://autotools.patch;patch=1"
9S = "${WORKDIR}/expat-${PV}"
10 5
11inherit autotools lib_package 6inherit lib_package
12export LTCC = "${CC}"
13 7
14do_configure () { 8do_configure () {
15 rm -f ${S}/conftools/libtool.m4 9 rm -f ${S}/conftools/libtool.m4
diff --git a/meta/packages/expat/expat_2.0.0.bb b/meta/packages/expat/expat_2.0.0.bb
new file mode 100644
index 0000000000..0fd825ee24
--- /dev/null
+++ b/meta/packages/expat/expat_2.0.0.bb
@@ -0,0 +1,27 @@
1require expat.inc
2PR = "r2"
3
4SRC_URI += "file://autotools.patch;patch=1"
5
6inherit lib_package
7
8do_configure() {
9 rm -f ${S}/conftools/libtool.m4
10 touch ${S}/conftools/libtool.m4
11 autotools_do_configure
12}
13
14do_stage() {
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}