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

bind: Update libxml2 check to make it deterministic. 

* Firstly configure scritp was testing files from bin folder.
  In our case we don't copy bin folder to sysroot for target
  recipes. So added extra check to validate .pc file from lib
  folder via a patch to configure.in file.
* Secondly linxml2 dependency was missing. So added PACKAGECONFIG
  for libxml2.

(From OE-Core rev: b61a2acc321489c3427f0afa3059486dc144a13b)

Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Noor 2015-01-07 18:51:18 +05:00 committed by Richard Purdie
parent 33f823660b
commit cbb4f57800
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch Normal file
View File

@ -0,0 +1,35 @@
From 8fa549fe5390875d56f75e20d364394cd5ccf388 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Mon, 3 Nov 2014 21:52:02 -0500
Subject: [PATCH] bind: add crosscripts search path for xml2-config
The configure script was testing xml2-config from bin but in openembedded
bin folder is not copied to sysroot so the test was failing. Added another
condition to test libxml-2.0.pc which is present in lib folder. Used pkg-config
to get libs and cflags information.
Upstream-Status: Inappropriate [ openembedded specific ]
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
---
configure.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.in b/configure.in
index 3d04f4c..6032f67 100644
--- a/configure.in
+++ b/configure.in
@@ -1433,6 +1433,9 @@ case "$use_libxml2" in
if test -f "$use_libxml2/bin/xml2-config" ; then
libxml2_libs=`$use_libxml2/bin/xml2-config --libs`
libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags`
+ elif test -f "$use_libxml2/lib/pkgconfig/libxml-2.0.pc" ; then
+ libxml2_libs=`pkg-config libxml-2.0 --libs`
+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
fi
;;
esac
--
1.9.1

9
meta/recipes-connectivity/bind/bind_9.9.5.bb
View File

@ -18,6 +18,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://bind9 \
file://init.d-add-support-for-read-only-rootfs.patch \
file://bind9_9_5-CVE-2014-8500.patch \
file://bind-add-crosscripts-search-path-for-xml2-config.patch \
"
SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
@ -29,10 +30,14 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
--disable-devpoll --disable-epoll --with-gost=no \
--with-gssapi=no --with-ecdsa=yes \
--sysconfdir=${sysconfdir}/bind \
--with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \
--with-openssl=${STAGING_LIBDIR}/.. \
--enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
"
inherit autotools-brokensep update-rc.d systemd useradd
inherit autotools-brokensep update-rc.d systemd useradd pkgconfig
PACKAGECONFIG ?= "libxml2"
PACKAGECONFIG[libxml2] = "--with-libxml2=${STAGING_LIBDIR}/..,--with-libxml2=no,libxml2"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \