diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/libxml')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch | 45 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.4.bb (renamed from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.3.bb) | 23 |
2 files changed, 12 insertions, 56 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch b/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch deleted file mode 100644 index 2f8079b052..0000000000 --- a/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.3.bb b/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.4.bb index 9c9873fbd0..59874bec2c 100644 --- a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.3.bb +++ b/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e" -DEPENDS = "zlib" +DEPENDS = "zlib virtual/libiconv" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ @@ -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" @@ -39,8 +38,11 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python" +PACKAGECONFIG ??= "python \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # WARNING: zlib is require for RPM use EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" @@ -48,12 +50,6 @@ EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --wi EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" -# required for python binding -export HOST_SYS -export BUILD_SYS -export STAGING_LIBDIR -export STAGING_INCDIR - python populate_packages_prepend () { # autonamer would call this libxml2-2, but we don't want that if d.getVar('DEBIAN_NAMES', True): @@ -67,6 +63,11 @@ FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" FILES_${PN}-utils += "${bindir}/*" FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" +do_configure_prepend () { + # executables take longer to package: these should not be executable + find ${WORKDIR}/xmlconf/ -type f -exec chmod -x {} \+ +} + do_install_ptest () { cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} } |