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-15 08:35:02 +0100 |
commit | 466428e13502229801803d6c49e512c4fa0239e2 (patch) | |
tree | 29e0943c84759ff4c54712e929e38aeb6bc1e64a /meta/recipes-core/libxml/libxml2 | |
parent | 4e5128b5e47315c9318f2fd6e74112ddcc998ece (diff) | |
download | poky-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/libxml/libxml2')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch | 45 |
1 files changed, 0 insertions, 45 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 @@ | |||
1 | configure.ac: fix cross compiling warning | ||
2 | |||
3 | There is a warning while cross compiling which triggered a | ||
4 | failure 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 | |||
12 | While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it. | ||
13 | |||
14 | Upstream-Status: Inappropriate [oe specific] | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | configure.ac | 5 +---- | ||
18 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 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 | -- | ||
44 | 1.9.1 | ||
45 | |||