diff options
Diffstat (limited to 'meta/recipes-core/expat')
-rw-r--r-- | meta/recipes-core/expat/expat.inc | 25 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/autotools.patch | 24 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/libtool-tag.patch | 30 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/no_getrandom.patch | 23 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat/run-ptest | 9 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.2.5.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.6.2.bb | 33 |
7 files changed, 42 insertions, 106 deletions
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc deleted file mode 100644 index 0ee6c276d9..0000000000 --- a/meta/recipes-core/expat/expat.inc +++ /dev/null @@ -1,25 +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" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ - file://autotools.patch \ - file://libtool-tag.patch \ - " - -SRC_URI_append_class-native = " file://no_getrandom.patch" - -inherit autotools lib_package - -# This package uses an archive format known to have issue with some -# versions of gzip -DEPENDS += "pigz-native" -do_unpack[depends] += "pigz-native:do_populate_sysroot" - -do_configure_prepend () { - rm -f ${S}/conftools/libtool.m4 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/expat/expat/autotools.patch b/meta/recipes-core/expat/expat/autotools.patch deleted file mode 100644 index 3d3c5bad9d..0000000000 --- a/meta/recipes-core/expat/expat/autotools.patch +++ /dev/null @@ -1,24 +0,0 @@ -Avoid using expat's m4 files - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Kevin Tian <kevin.tian@intel.com> -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Updated to apply over expat 2.1.0 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - -diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in ---- expat-2.1.0/configure.ac 2012-03-04 01:45:53.000000000 +0200 -+++ expat-2.1.0/configure.ac 2012-05-10 21:04:44.000000000 +0300 -@@ -51,8 +51,6 @@ - - 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/libtool-tag.patch b/meta/recipes-core/expat/expat/libtool-tag.patch deleted file mode 100644 index 0a0aed23e5..0000000000 --- a/meta/recipes-core/expat/expat/libtool-tag.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 2 Nov 2017 18:20:57 +0800 -Subject: [PATCH] Add CC tag to build - -Add CC tag to build - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 9560a95..d444bd6 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -319,7 +319,7 @@ LIBCURRENT = @LIBCURRENT@ - LIBOBJS = @LIBOBJS@ - LIBREVISION = @LIBREVISION@ - LIBS = @LIBS@ --LIBTOOL = @LIBTOOL@ -+LIBTOOL = @LIBTOOL@ --tag CC - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ --- -2.7.4 - diff --git a/meta/recipes-core/expat/expat/no_getrandom.patch b/meta/recipes-core/expat/expat/no_getrandom.patch deleted file mode 100644 index d64f1bf113..0000000000 --- a/meta/recipes-core/expat/expat/no_getrandom.patch +++ /dev/null @@ -1,23 +0,0 @@ -The native version of expat may be used on older systems which dont have glibc 2.25 -and hence don't have getrandom() thanks to uninative. Disable the libc call and -use the syscall instead to avoid a compatibility issue until we have 2.25 everywhere -we support with uninative. - -RP -2017/8/14 - -Upstream-Status: Inappropriate - -Index: expat-2.2.3/configure.ac -=================================================================== ---- expat-2.2.3.orig/configure.ac -+++ expat-2.2.3/configure.ac -@@ -151,7 +151,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <stdlib.h> /* for NULL */ - #include <sys/random.h> - int main() { -- return getrandom(NULL, 0U, 0U); -+ return getrandomBREAKME(NULL, 0U, 0U); - } - ])], [ - AC_DEFINE([HAVE_GETRANDOM], [1], diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..ff7986db3c --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,9 @@ +#!/bin/bash + +TIME=$(which time) + +echo "runtests" +${TIME} -f 'Execution time: %e s' bash -c "./runtests -v" +echo "runtestspp" +${TIME} -f 'Execution time: %e s' bash -c "./runtests_cxx -v" +echo diff --git a/meta/recipes-core/expat/expat_2.2.5.bb b/meta/recipes-core/expat/expat_2.2.5.bb deleted file mode 100644 index 337287b93b..0000000000 --- a/meta/recipes-core/expat/expat_2.2.5.bb +++ /dev/null @@ -1,4 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" -SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49" -SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" diff --git a/meta/recipes-core/expat/expat_2.6.2.bb b/meta/recipes-core/expat/expat_2.6.2.bb new file mode 100644 index 0000000000..6c9db91bef --- /dev/null +++ b/meta/recipes-core/expat/expat_2.6.2.bb @@ -0,0 +1,33 @@ +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 = "https://github.com/libexpat/libexpat" +SECTION = "libs" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb" + +VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" + +SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ + file://run-ptest \ + " + +GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/" +UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)" + +SRC_URI[sha256sum] = "9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3b927e0" + +EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" + +RDEPENDS:${PN}-ptest += "bash" + +inherit cmake lib_package ptest github-releases + +do_install_ptest:class-target() { + install -m 755 ${B}/tests/runtests* ${D}${PTEST_PATH} + install -m 755 ${B}/tests/benchmark/benchmark ${D}${PTEST_PATH} +} + +BBCLASSEXTEND += "native nativesdk" + +CVE_PRODUCT = "expat libexpat" |