diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-11-25 22:44:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:14 +0000 |
| commit | ed318749f992058c4faafcd551df4e73ced2a793 (patch) | |
| tree | 30590ad98fb7e132ca0e17df8bb8bd998cd8c495 /meta/recipes-core/libxml/libxml2/ansidecl.patch | |
| parent | ecb1c717617b4c9068c65d0d6fc0329db1ef8a13 (diff) | |
| download | poky-ed318749f992058c4faafcd551df4e73ced2a793.tar.gz | |
libxml2: upgrade to 2.9.3
- Drop all the upstreamed patches
- Rework the ansidecl removal so it's contained in a single patch
(From OE-Core rev: 88e68f25e1756988692108d4c15dfa8efc94e5e5)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/ansidecl.patch')
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/ansidecl.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-core/libxml/libxml2/ansidecl.patch b/meta/recipes-core/libxml/libxml2/ansidecl.patch index 2452d780d5..1085c680b6 100644 --- a/meta/recipes-core/libxml/libxml2/ansidecl.patch +++ b/meta/recipes-core/libxml/libxml2/ansidecl.patch | |||
| @@ -9,17 +9,17 @@ RP 2012/7/10 | |||
| 9 | 9 | ||
| 10 | Upstream-Status: Inappropriate [its really a cmake bug] | 10 | Upstream-Status: Inappropriate [its really a cmake bug] |
| 11 | 11 | ||
| 12 | Index: libxml2-2.8.0/include/libxml/xmlversion.h.in | 12 | diff --git a/configure.ac b/configure.ac |
| 13 | =================================================================== | 13 | index 0260281..fdb58e9 100644 |
| 14 | --- libxml2-2.8.0.orig/include/libxml/xmlversion.h.in 2012-07-10 11:51:52.460750573 +0000 | 14 | --- a/configure.ac |
| 15 | +++ libxml2-2.8.0/include/libxml/xmlversion.h.in 2012-07-10 11:52:41.436749397 +0000 | 15 | +++ b/configure.ac |
| 16 | @@ -401,9 +401,6 @@ | 16 | @@ -484 +483,0 @@ AC_CHECK_HEADERS([time.h]) |
| 17 | #endif | 17 | -AC_CHECK_HEADERS([ansidecl.h]) |
| 18 | 18 | diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in | |
| 19 | #ifdef __GNUC__ | 19 | index b173be9..d10f975 100644 |
| 20 | --- a/include/libxml/xmlversion.h.in | ||
| 21 | +++ b/include/libxml/xmlversion.h.in | ||
| 22 | @@ -413,3 +412,0 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); | ||
| 20 | -#ifdef HAVE_ANSIDECL_H | 23 | -#ifdef HAVE_ANSIDECL_H |
| 21 | -#include <ansidecl.h> | 24 | -#include <ansidecl.h> |
| 22 | -#endif | 25 | -#endif |
| 23 | |||
| 24 | /** | ||
| 25 | * ATTRIBUTE_UNUSED: | ||