diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2016-06-13 05:16:32 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-14 12:56:33 +0100 |
| commit | 323c7cec65603476994dde196f4c2c151d0e0d31 (patch) | |
| tree | 377fe49f15087eda055a8d876c35fe495dce4fc3 | |
| parent | 8e24a6ed1cd6fd91f9b4644b1fa199e516c25fa2 (diff) | |
| download | openembedded-core-323c7cec65603476994dde196f4c2c151d0e0d31.tar.gz openembedded-core-323c7cec65603476994dde196f4c2c151d0e0d31.tar.bz2 openembedded-core-323c7cec65603476994dde196f4c2c151d0e0d31.zip | |
libxml2: upgrade to 2.9.4
- Drop configure.ac-fix-cross-compiling-warning.patch,
libxml2 2.9.4 has fixed it
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch | 45 | ||||
| -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 @@ -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_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 \ file://run-ptest \ file://python-sitepackages-dir.patch \ file://libxml-m4-use-pkgconfig.patch \ - file://configure.ac-fix-cross-compiling-warning.patch \ " -SRC_URI[libtar.md5sum] = "daece17e045f1c107610e137ab50c179" -SRC_URI[libtar.sha256sum] = "4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d" +SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" +SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" |