summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-06-13 05:16:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 08:35:02 +0100
commit466428e13502229801803d6c49e512c4fa0239e2 (patch)
tree29e0943c84759ff4c54712e929e38aeb6bc1e64a /meta/recipes-core
parent4e5128b5e47315c9318f2fd6e74112ddcc998ece (diff)
downloadpoky-466428e13502229801803d6c49e512c4fa0239e2.tar.gz
libxml2: upgrade to 2.9.4
- Drop configure.ac-fix-cross-compiling-warning.patch, libxml2 2.9.4 has fixed it (From OE-Core rev: 323c7cec65603476994dde196f4c2c151d0e0d31) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch45
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.4.bb (renamed from meta/recipes-core/libxml/libxml2_2.9.3.bb)5
2 files changed, 2 insertions, 48 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
deleted file mode 100644
index 2f8079b052..0000000000
--- a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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_2.9.3.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index ae65159f2c..5ff508a5ce 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.3.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -19,11 +19,10 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
19 file://run-ptest \ 19 file://run-ptest \
20 file://python-sitepackages-dir.patch \ 20 file://python-sitepackages-dir.patch \
21 file://libxml-m4-use-pkgconfig.patch \ 21 file://libxml-m4-use-pkgconfig.patch \
22 file://configure.ac-fix-cross-compiling-warning.patch \
23 " 22 "
24 23
25SRC_URI[libtar.md5sum] = "daece17e045f1c107610e137ab50c179" 24SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5"
26SRC_URI[libtar.sha256sum] = "4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d" 25SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"
27SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" 26SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a"
28SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" 27SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7"
29 28