diff options
author | Kevin Tian <kevin.tian@intel.com> | 2010-07-23 15:17:06 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-24 00:01:23 +0100 |
commit | 0ff62b0462f3f64672bd4704de9a192eb1a730d1 (patch) | |
tree | 1774913dd648d1ae62a4a189ea65b541309d4365 /meta/packages/expat | |
parent | f23b594087dba38054a3001e66390d462fa61cbb (diff) | |
download | poky-0ff62b0462f3f64672bd4704de9a192eb1a730d1.tar.gz |
expat: use gzip-native for unpack
expat 2.0.1 archive is generated with DOS format, which causes CRC
error for some version of gzip (<1.4), e.g. on Unbuntu 10.04. This
commit adds do_unpack dependency to gzip-native, and thus to use
local compiled binary to address this issue. Since 1.4 is a known
version solving this issue, also specify a default version for
gzip-native
also move most lines into expat.inc as cleanup
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/expat')
-rw-r--r-- | meta/packages/expat/expat.inc | 14 | ||||
-rw-r--r-- | meta/packages/expat/expat_2.0.1.bb | 11 |
2 files changed, 13 insertions, 12 deletions
diff --git a/meta/packages/expat/expat.inc b/meta/packages/expat/expat.inc index d47e340629..8c5010e481 100644 --- a/meta/packages/expat/expat.inc +++ b/meta/packages/expat/expat.inc | |||
@@ -3,7 +3,17 @@ HOMEPAGE = "http://expat.sourceforge.net/" | |||
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | 5 | ||
6 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz" | 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ |
7 | file://autotools.patch" | ||
7 | 8 | ||
8 | inherit autotools | 9 | inherit autotools lib_package |
9 | 10 | ||
11 | # This package uses an archive format known to have issue with some | ||
12 | # versions of gzip | ||
13 | do_unpack[depends] += "gzip-native:do_populate_sysroot" | ||
14 | |||
15 | do_configure_prepend () { | ||
16 | rm -f ${S}/conftools/libtool.m4 | ||
17 | } | ||
18 | |||
19 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/packages/expat/expat_2.0.1.bb b/meta/packages/expat/expat_2.0.1.bb index da2682e41f..9983fe5838 100644 --- a/meta/packages/expat/expat_2.0.1.bb +++ b/meta/packages/expat/expat_2.0.1.bb | |||
@@ -1,12 +1,3 @@ | |||
1 | require expat.inc | 1 | require expat.inc |
2 | PR = "r0" | ||
3 | |||
4 | SRC_URI += "file://autotools.patch;" | ||
5 | |||
6 | inherit lib_package | ||
7 | 2 | ||
8 | do_configure_prepend () { | 3 | PR = "r0" |
9 | rm -f ${S}/conftools/libtool.m4 | ||
10 | } | ||
11 | |||
12 | BBCLASSEXTEND = "native nativesdk" | ||