From 485db07c099845ec106cf555065676efef61030f Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 29 Jun 2019 19:52:07 +0200 Subject: expat: update to 2.2.7 Removed patch is not appropriate anymore. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- meta/recipes-core/expat/expat/autotools.patch | 25 ------------------------- meta/recipes-core/expat/expat_2.2.6.bb | 23 ----------------------- meta/recipes-core/expat/expat_2.2.7.bb | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-core/expat/expat/autotools.patch delete mode 100644 meta/recipes-core/expat/expat_2.2.6.bb create mode 100644 meta/recipes-core/expat/expat_2.2.7.bb 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 @@ -Avoid using expat's m4 files - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Kevin Tian -Signed-off-by: Scott Garman - -Updated to apply over expat 2.1.0 - -Signed-off-by: Marko Lindqvist - -Index: expat-2.2.5/configure.ac -=================================================================== ---- expat-2.2.5.orig/configure.ac -+++ expat-2.2.5/configure.ac -@@ -53,8 +53,6 @@ LIBAGE=6 # CMakeLists.txt! - CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H" - AC_CONFIG_HEADER(expat_config.h) - --sinclude(conftools/ac_c_bigendian_cross.m4) -- - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL - diff --git a/meta/recipes-core/expat/expat_2.2.6.bb b/meta/recipes-core/expat/expat_2.2.6.bb deleted file mode 100644 index c9e6081a35..0000000000 --- a/meta/recipes-core/expat/expat_2.2.6.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "A stream-oriented XML parser library" -DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" -HOMEPAGE = "http://expat.sourceforge.net/" -SECTION = "libs" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ - file://autotools.patch \ - file://libtool-tag.patch \ - " - -SRC_URI[md5sum] = "ca047ae951b40020ac831c28859161b2" -SRC_URI[sha256sum] = "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2" - -inherit autotools lib_package - -do_configure_prepend () { - rm -f ${S}/conftools/libtool.m4 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/expat/expat_2.2.7.bb b/meta/recipes-core/expat/expat_2.2.7.bb new file mode 100644 index 0000000000..f213bc3c3e --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.7.bb @@ -0,0 +1,22 @@ +SUMMARY = "A stream-oriented XML parser library" +DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" +HOMEPAGE = "http://expat.sourceforge.net/" +SECTION = "libs" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ + file://libtool-tag.patch \ + " + +SRC_URI[md5sum] = "72f36b87cdb478aba1e78473393766aa" +SRC_URI[sha256sum] = "cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18" + +inherit autotools lib_package + +do_configure_prepend () { + rm -f ${S}/conftools/libtool.m4 +} + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg