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-24 17:48:57 +0000 |
| commit | 06f555fa5a36dbf63b26c3734dbbd0b5af16dc33 (patch) | |
| tree | 2d9fb2247001682447da1ba2f36a3f47b0c456ff /meta/recipes-core/libxml/libxml2 | |
| parent | 346a023a42f127881476e760e8fa4e04303849b9 (diff) | |
| download | openembedded-core-contrib-06f555fa5a36dbf63b26c3734dbbd0b5af16dc33.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
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 @@ +configure.ac: fix cross compiling warning + +There is a warning while cross compiling which triggered a +failure by do_qa_configure +... +|configure:12652: checking for gzread in -lz +|configure:12677: mips-poky-linux-gcc -meb -mabi=32 -mhard-float + -L/lib conftest.c -lz >&5 +|ld: warning: library search path "/lib" is unsafe for cross-compilation +... + +While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9a90600..0bac8a4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -391,8 +391,6 @@ if test "$with_zlib" = "no"; then + echo "Disabling compression support" + else + AC_CHECK_HEADERS(zlib.h, +- [SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-L${Z_DIR}/lib" + AC_CHECK_LIB(z, gzread,[ + AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) + WITH_ZLIB=1 +@@ -406,8 +404,7 @@ else + esac] + else + Z_LIBS="-lz" +- fi]) +- LDFLAGS="${SAVE_LDFLAGS}"]) ++ fi])) + fi + + AC_SUBST(Z_CFLAGS) +-- +1.9.1 + 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 correct path here so we need to be able to specify it ourselves. Upstream-Status: Inappropriate [config] - Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- a/configure.in -+++ b/configure.in -@@ -743,7 +743,8 @@ dnl +Rebase to 2.9.2 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -813,7 +813,8 @@ dnl PYTHON_VERSION= PYTHON_INCLUDES= @@ -19,3 +25,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> PYTHON_TESTS= pythondir= if test "$with_python" != "no" ; then +-- +1.9.1 + |