diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-06-29 19:52:07 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-30 22:40:52 +0100 |
commit | 8e473ebef8c52c6d04bf016b22dd088c72755d30 (patch) | |
tree | 0cf93a4739fc513909b49f697c96f2c532ef2c9f | |
parent | 8763309bd4ef779e549c0f7c1bc8ba4f8bea149f (diff) | |
download | poky-8e473ebef8c52c6d04bf016b22dd088c72755d30.tar.gz |
expat: update to 2.2.7
Removed patch is not appropriate anymore.
(From OE-Core rev: 485db07c099845ec106cf555065676efef61030f)
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/expat/expat/autotools.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.2.7.bb (renamed from meta/recipes-core/expat/expat_2.2.6.bb) | 5 |
2 files changed, 2 insertions, 28 deletions
diff --git a/meta/recipes-core/expat/expat/autotools.patch b/meta/recipes-core/expat/expat/autotools.patch deleted file mode 100644 index 104717eabb..0000000000 --- a/meta/recipes-core/expat/expat/autotools.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Avoid using expat's m4 files | ||
2 | |||
3 | Upstream-Status: Inappropriate [Other] | ||
4 | Workaround specific to our build system. | ||
5 | |||
6 | Signed-off-by: Kevin Tian <kevin.tian@intel.com> | ||
7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
8 | |||
9 | Updated to apply over expat 2.1.0 | ||
10 | |||
11 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
12 | |||
13 | Index: expat-2.2.5/configure.ac | ||
14 | =================================================================== | ||
15 | --- expat-2.2.5.orig/configure.ac | ||
16 | +++ expat-2.2.5/configure.ac | ||
17 | @@ -53,8 +53,6 @@ LIBAGE=6 # CMakeLists.txt! | ||
18 | CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H" | ||
19 | AC_CONFIG_HEADER(expat_config.h) | ||
20 | |||
21 | -sinclude(conftools/ac_c_bigendian_cross.m4) | ||
22 | - | ||
23 | AC_LIBTOOL_WIN32_DLL | ||
24 | AC_PROG_LIBTOOL | ||
25 | |||
diff --git a/meta/recipes-core/expat/expat_2.2.6.bb b/meta/recipes-core/expat/expat_2.2.7.bb index c9e6081a35..f213bc3c3e 100644 --- a/meta/recipes-core/expat/expat_2.2.6.bb +++ b/meta/recipes-core/expat/expat_2.2.7.bb | |||
@@ -7,12 +7,11 @@ LICENSE = "MIT" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" |
8 | 8 | ||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ | 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ |
10 | file://autotools.patch \ | ||
11 | file://libtool-tag.patch \ | 10 | file://libtool-tag.patch \ |
12 | " | 11 | " |
13 | 12 | ||
14 | SRC_URI[md5sum] = "ca047ae951b40020ac831c28859161b2" | 13 | SRC_URI[md5sum] = "72f36b87cdb478aba1e78473393766aa" |
15 | SRC_URI[sha256sum] = "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2" | 14 | SRC_URI[sha256sum] = "cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18" |
16 | 15 | ||
17 | inherit autotools lib_package | 16 | inherit autotools lib_package |
18 | 17 | ||