summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libxml
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-12-23 13:09:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-25 08:18:12 +0000
commitbd4052b6cf13bcb5033a860a756a5b4587563ee7 (patch)
treec6c290791586d89e0f512f1fc2de5c784683799f /meta/recipes-core/libxml
parent3ef9f83ab7040684cbc62b276a2598cce55e6c8d (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/libxml/libxml2.inc6
-rw-r--r--meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch45
-rw-r--r--meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch17
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.2.bb (renamed from meta/recipes-core/libxml/libxml2_2.9.1.bb)4
4 files changed, 63 insertions, 9 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index c729c199cf..1314bbfb8d 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -21,7 +21,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
21 file://libxml2-CVE-2014-0191-fix.patch \ 21 file://libxml2-CVE-2014-0191-fix.patch \
22 file://python-sitepackages-dir.patch \ 22 file://python-sitepackages-dir.patch \
23 file://libxml-m4-use-pkgconfig.patch \ 23 file://libxml-m4-use-pkgconfig.patch \
24 file://libxml2-CVE-2014-3660.patch \ 24 file://configure.ac-fix-cross-compiling-warning.patch \
25 " 25 "
26 26
27BINCONFIG = "${bindir}/xml2-config" 27BINCONFIG = "${bindir}/xml2-config"
@@ -34,7 +34,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm
34 34
35# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header 35# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
36do_configure_prepend () { 36do_configure_prepend () {
37 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in 37 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac
38} 38}
39 39
40do_configure_prepend_class-nativesdk () { 40do_configure_prepend_class-nativesdk () {
@@ -66,7 +66,7 @@ PACKAGES += "${PN}-utils ${PN}-python"
66 66
67FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" 67FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
68FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" 68FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
69FILES_${PN}-dev += "${libdir}/xml2Conf.sh" 69FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*"
70FILES_${PN}-utils += "${bindir}/*" 70FILES_${PN}-utils += "${bindir}/*"
71FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" 71FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}"
72 72
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 @@
1configure.ac: fix cross compiling warning
2
3There is a warning while cross compiling which triggered a
4failure 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
12While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it.
13
14Upstream-Status: Inappropriate [oe specific]
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16---
17 configure.ac | 5 +----
18 1 file changed, 1 insertion(+), 4 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 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--
441.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
4correct path here so we need to be able to specify it ourselves. 4correct path here so we need to be able to specify it ourselves.
5 5
6Upstream-Status: Inappropriate [config] 6Upstream-Status: Inappropriate [config]
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 7Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9 8
10--- a/configure.in 9Rebase to 2.9.2
11+++ b/configure.in 10Signed-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
15diff --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--
291.9.1
30
diff --git a/meta/recipes-core/libxml/libxml2_2.9.1.bb b/meta/recipes-core/libxml/libxml2_2.9.2.bb
index 0b6ac5d5c6..f0cfa59309 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.1.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.2.bb
@@ -2,7 +2,7 @@ require libxml2.inc
2 2
3SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar" 3SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar"
4 4
5SRC_URI[libtar.md5sum] = "9c0cfef285d5c4a5c80d00904ddab380" 5SRC_URI[libtar.md5sum] = "9e6a9aca9d155737868b3dc5fd82f788"
6SRC_URI[libtar.sha256sum] = "fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb" 6SRC_URI[libtar.sha256sum] = "5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc"
7SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" 7SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a"
8SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" 8SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7"