sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Hongxu Jia 2016-06-13 05:16:32 -04:00 committed by Richard Purdie
parent 4e5128b5e4
commit 466428e135
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch
View File

@ -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

5
meta/recipes-core/libxml/libxml2_2.9.3.bb → meta/recipes-core/libxml/libxml2_2.9.4.bb
View File

@ -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"