diff options
author | Kevin Tian <kevin.tian@intel.com> | 2010-07-07 10:26:50 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-08 21:05:40 -0700 |
commit | 5dcefd18d60b01be84fb1b32ea759613d5216a5f (patch) | |
tree | 93b37f922cdd50aa3f09335e1929d0bbd4b294c3 /meta | |
parent | cf3796f66318074737bbf9e0b43da8063f9fe43a (diff) | |
download | poky-5dcefd18d60b01be84fb1b32ea759613d5216a5f.tar.gz |
expat: upgrade to 2.0.1
[Patches]
KEEP _autotools.patch_: avoid using expat's own libtool.m4. add comment
[Recipe]
- fix SRC_URI format
- no need to export LTCC, as the default will be ${CC}
- no need to touch libtool.m4
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/expat/expat-2.0.1/autotools.patch (renamed from meta/packages/expat/expat-2.0.0/autotools.patch) | 4 | ||||
-rw-r--r-- | meta/packages/expat/expat.inc | 4 | ||||
-rw-r--r-- | meta/packages/expat/expat_2.0.1.bb (renamed from meta/packages/expat/expat_2.0.0.bb) | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/meta/packages/expat/expat-2.0.0/autotools.patch b/meta/packages/expat/expat-2.0.1/autotools.patch index 77aee3a833..ff1578f47e 100644 --- a/meta/packages/expat/expat-2.0.0/autotools.patch +++ b/meta/packages/expat/expat-2.0.1/autotools.patch | |||
@@ -1,3 +1,7 @@ | |||
1 | # avoid to use expat's own *.m4 | ||
2 | # | ||
3 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-07 | ||
4 | |||
1 | diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in | 5 | diff -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 | 6 | --- 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 | 7 | +++ expat-2.0.0/configure.in 2006-02-10 19:12:24.000000000 -0600 |
diff --git a/meta/packages/expat/expat.inc b/meta/packages/expat/expat.inc index df2243ad0d..d47e340629 100644 --- a/meta/packages/expat/expat.inc +++ b/meta/packages/expat/expat.inc | |||
@@ -3,9 +3,7 @@ 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 | " | ||
8 | export LTCC = "${CC}" | ||
9 | 7 | ||
10 | inherit autotools | 8 | inherit autotools |
11 | 9 | ||
diff --git a/meta/packages/expat/expat_2.0.0.bb b/meta/packages/expat/expat_2.0.1.bb index a946d9ab50..da2682e41f 100644 --- a/meta/packages/expat/expat_2.0.0.bb +++ b/meta/packages/expat/expat_2.0.1.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require expat.inc | 1 | require expat.inc |
2 | PR = "r3" | 2 | PR = "r0" |
3 | 3 | ||
4 | SRC_URI += "file://autotools.patch;" | 4 | SRC_URI += "file://autotools.patch;" |
5 | 5 | ||
@@ -7,7 +7,6 @@ inherit lib_package | |||
7 | 7 | ||
8 | do_configure_prepend () { | 8 | do_configure_prepend () { |
9 | rm -f ${S}/conftools/libtool.m4 | 9 | rm -f ${S}/conftools/libtool.m4 |
10 | touch ${S}/conftools/libtool.m4 | ||
11 | } | 10 | } |
12 | 11 | ||
13 | BBCLASSEXTEND = "native nativesdk" | 12 | BBCLASSEXTEND = "native nativesdk" |