diff options
author | Ross Burton <ross.burton@arm.com> | 2022-12-07 16:57:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-08 10:50:30 +0000 |
commit | f4ffba353eb7877060c25d264fa10cd60f797f0b (patch) | |
tree | f7163587ea88974eb0b7ba7636f139ffbae0916f /meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch | |
parent | 85ec78cc24346f8e0d45ca947a2fecf17913b535 (diff) | |
download | poky-f4ffba353eb7877060c25d264fa10cd60f797f0b.tar.gz |
libxml2: upgrade 2.9.14 -> 2.10.3
Change ptest away from using the upstream Makefiles to manually running
the tests: they're not actually integrated with automake anyway so this
didn't gain us anything apart from patches we can't send upstream. Drops
the following patches:
- 0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
- 0001-Port-gentest.py-to-Python-3.patch
- fix-execution-of-ptests.patch
- remove-fuzz-from-ptests.patch
- runtest.patch
Add a simple patch to install the test binaries via the Makefile:
- install-tests.patch
The Python module is built differently and a number of patches no longer
apply and appear to be redundant, remove:
- python-sitepackages-dir.patch
libxml-m4-use-pkgconfig.patch has been sent upstream now, mark as
backport.
Remove obsolete --without-docbook option.
Remove obsolete xml2Conf.sh packaging.
(From OE-Core rev: ec5f380a14246e31b2a1a12dda9fe2178b1e5f83)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch index cc9da88a29..639c80bd6c 100644 --- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch +++ b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch | |||
@@ -1,26 +1,8 @@ | |||
1 | From 7196bce35954c4b46391cb0139aeb15ed628fa54 Mon Sep 17 00:00:00 2001 | 1 | Change the AM_PATH_XML2 macros to use pkg-config instead of xml2-config. |
2 | From: Tony Tascioglu <tony.tascioglu@windriver.com> | ||
3 | Date: Fri, 14 May 2021 11:50:35 -0400 | ||
4 | Subject: [PATCH] AM_PATH_XML2 uses xml-config which we disable through | ||
5 | 2 | ||
6 | binconfig-disabled.bbclass, so port it to use pkg-config instead. | 3 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/d598d8af0913b6e3d4e61ffa62397a275b669dca] |
4 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
7 | 5 | ||
8 | This cannot be upstreamed, as the original macro supports various | ||
9 | optional arguments which cannot be supported with a direct call | ||
10 | to pkg-config. | ||
11 | |||
12 | Upstream-Status: Inappropriate [oe-core specific; see above] | ||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | Rebase to 2.9.9 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | |||
18 | Updated to apply cleanly to v2.9.12 | ||
19 | Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> | ||
20 | |||
21 | Rebase to 2.9.14 | ||
22 | Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> | ||
23 | --- | ||
24 | libxml.m4 | 189 ++---------------------------------------------------- | 6 | libxml.m4 | 189 ++---------------------------------------------------- |
25 | 1 file changed, 5 insertions(+), 184 deletions(-) | 7 | 1 file changed, 5 insertions(+), 184 deletions(-) |
26 | 8 | ||