diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-core/expat | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/expat')
-rw-r--r-- | poky/meta/recipes-core/expat/expat/autotools.patch | 25 | ||||
-rw-r--r-- | poky/meta/recipes-core/expat/expat/libtool-tag.patch | 30 | ||||
-rw-r--r-- | poky/meta/recipes-core/expat/expat_2.2.5.bb | 23 |
3 files changed, 78 insertions, 0 deletions
diff --git a/poky/meta/recipes-core/expat/expat/autotools.patch b/poky/meta/recipes-core/expat/expat/autotools.patch new file mode 100644 index 0000000000..104717eabb --- /dev/null +++ b/poky/meta/recipes-core/expat/expat/autotools.patch @@ -0,0 +1,25 @@ +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> + +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/poky/meta/recipes-core/expat/expat/libtool-tag.patch b/poky/meta/recipes-core/expat/expat/libtool-tag.patch new file mode 100644 index 0000000000..0a0aed23e5 --- /dev/null +++ b/poky/meta/recipes-core/expat/expat/libtool-tag.patch @@ -0,0 +1,30 @@ +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/poky/meta/recipes-core/expat/expat_2.2.5.bb b/poky/meta/recipes-core/expat/expat_2.2.5.bb new file mode 100644 index 0000000000..c68a2ef367 --- /dev/null +++ b/poky/meta/recipes-core/expat/expat_2.2.5.bb @@ -0,0 +1,23 @@ +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] = "789e297f547980fc9ecc036f9a070d49" +SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" + +inherit autotools lib_package + +do_configure_prepend () { + rm -f ${S}/conftools/libtool.m4 +} + +BBCLASSEXTEND = "native nativesdk" |