diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-12-23 13:09:54 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-25 08:18:12 +0000 |
commit | bd4052b6cf13bcb5033a860a756a5b4587563ee7 (patch) | |
tree | c6c290791586d89e0f512f1fc2de5c784683799f /meta/recipes-core/libxml/libxml2 | |
parent | 3ef9f83ab7040684cbc62b276a2598cce55e6c8d (diff) | |
download | poky-bd4052b6cf13bcb5033a860a756a5b4587563ee7.tar.gz |
libxml2: upgrade to 2.9.2
- Rebase python-sitepackages-dir.patch to 2.9.2
- Drop libxml2-CVE-2014-3660.patch which has been merged to 2.9.2.
- Add configure.ac-fix-cross-compiling-warning.patch to fix cross
compilation failure.
- Tweak do_configure_prepend, use configure.ac to instead of configure.in
- Add cmake files to ${PN}-dev
(From OE-Core rev: 06f555fa5a36dbf63b26c3734dbbd0b5af16dc33)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch | 45 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch | 17 |
2 files changed, 58 insertions, 4 deletions
diff --git a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch new file mode 100644 index 0000000000..2f8079b052 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | configure.ac: fix cross compiling warning | ||
2 | |||
3 | There is a warning while cross compiling which triggered a | ||
4 | failure by do_qa_configure | ||
5 | ... | ||
6 | |configure:12652: checking for gzread in -lz | ||
7 | |configure:12677: mips-poky-linux-gcc -meb -mabi=32 -mhard-float | ||
8 | -L/lib conftest.c -lz >&5 | ||
9 | |ld: warning: library search path "/lib" is unsafe for cross-compilation | ||
10 | ... | ||
11 | |||
12 | While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it. | ||
13 | |||
14 | Upstream-Status: Inappropriate [oe specific] | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | configure.ac | 5 +---- | ||
18 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 9a90600..0bac8a4 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -391,8 +391,6 @@ if test "$with_zlib" = "no"; then | ||
25 | echo "Disabling compression support" | ||
26 | else | ||
27 | AC_CHECK_HEADERS(zlib.h, | ||
28 | - [SAVE_LDFLAGS="${LDFLAGS}" | ||
29 | - LDFLAGS="-L${Z_DIR}/lib" | ||
30 | AC_CHECK_LIB(z, gzread,[ | ||
31 | AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) | ||
32 | WITH_ZLIB=1 | ||
33 | @@ -406,8 +404,7 @@ else | ||
34 | esac] | ||
35 | else | ||
36 | Z_LIBS="-lz" | ||
37 | - fi]) | ||
38 | - LDFLAGS="${SAVE_LDFLAGS}"]) | ||
39 | + fi])) | ||
40 | fi | ||
41 | |||
42 | AC_SUBST(Z_CFLAGS) | ||
43 | -- | ||
44 | 1.9.1 | ||
45 | |||
diff --git a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch index a697ddf873..e83c8325e5 100644 --- a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch +++ b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch | |||
@@ -4,12 +4,18 @@ The python binary used when building for nativesdk doesn't give us the | |||
4 | correct path here so we need to be able to specify it ourselves. | 4 | correct path here so we need to be able to specify it ourselves. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [config] | 6 | Upstream-Status: Inappropriate [config] |
7 | |||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 7 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
9 | 8 | ||
10 | --- a/configure.in | 9 | Rebase to 2.9.2 |
11 | +++ b/configure.in | 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | @@ -743,7 +743,8 @@ dnl | 11 | --- |
12 | configure.ac | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -813,7 +813,8 @@ dnl | ||
13 | 19 | ||
14 | PYTHON_VERSION= | 20 | PYTHON_VERSION= |
15 | PYTHON_INCLUDES= | 21 | PYTHON_INCLUDES= |
@@ -19,3 +25,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | |||
19 | PYTHON_TESTS= | 25 | PYTHON_TESTS= |
20 | pythondir= | 26 | pythondir= |
21 | if test "$with_python" != "no" ; then | 27 | if test "$with_python" != "no" ; then |
28 | -- | ||
29 | 1.9.1 | ||
30 | |||