diff options
Diffstat (limited to 'meta')
-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 @@ | |||
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 | |||
diff --git a/meta/recipes-core/libxml/libxml2_2.9.3.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index 481346cdb6..54231a5aa7 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 | ||
25 | SRC_URI[libtar.md5sum] = "daece17e045f1c107610e137ab50c179" | 24 | SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" |
26 | SRC_URI[libtar.sha256sum] = "4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d" | 25 | SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" |
27 | SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" | 26 | SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" |
28 | SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" | 27 | SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" |
29 | 28 | ||