summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNoor <noor_ahsan@mentor.com>2015-01-07 18:51:18 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-08 09:24:50 +0000
commitcbb4f578009535322f0f81c1173e32567be5e6f3 (patch)
tree95220e1822a9eae67a4e0018fc3c7d9cf8bac6f8 /meta
parent33f823660b30d304156e2022029808a15eaa08bf (diff)
downloadpoky-cbb4f578009535322f0f81c1173e32567be5e6f3.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch35
-rw-r--r--meta/recipes-connectivity/bind/bind_9.9.5.bb9
2 files changed, 42 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch
new file mode 100644
index 0000000000..4f1a3f8e89
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch
@@ -0,0 +1,35 @@
1From 8fa549fe5390875d56f75e20d364394cd5ccf388 Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe_macdonald@mentor.com>
3Date: Mon, 3 Nov 2014 21:52:02 -0500
4Subject: [PATCH] bind: add crosscripts search path for xml2-config
5
6The configure script was testing xml2-config from bin but in openembedded
7bin folder is not copied to sysroot so the test was failing. Added another
8condition to test libxml-2.0.pc which is present in lib folder. Used pkg-config
9to get libs and cflags information.
10
11Upstream-Status: Inappropriate [ openembedded specific ]
12
13Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
14Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
15---
16 configure.in | 3 +++
17 1 file changed, 3 insertions(+)
18
19diff --git a/configure.in b/configure.in
20index 3d04f4c..6032f67 100644
21--- a/configure.in
22+++ b/configure.in
23@@ -1433,6 +1433,9 @@ case "$use_libxml2" in
24 if test -f "$use_libxml2/bin/xml2-config" ; then
25 libxml2_libs=`$use_libxml2/bin/xml2-config --libs`
26 libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags`
27+ elif test -f "$use_libxml2/lib/pkgconfig/libxml-2.0.pc" ; then
28+ libxml2_libs=`pkg-config libxml-2.0 --libs`
29+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
30 fi
31 ;;
32 esac
33--
341.9.1
35
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index 8e04f8a040..eacb23ffb8 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -18,6 +18,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
18 file://bind9 \ 18 file://bind9 \
19 file://init.d-add-support-for-read-only-rootfs.patch \ 19 file://init.d-add-support-for-read-only-rootfs.patch \
20 file://bind9_9_5-CVE-2014-8500.patch \ 20 file://bind9_9_5-CVE-2014-8500.patch \
21 file://bind-add-crosscripts-search-path-for-xml2-config.patch \
21 " 22 "
22 23
23SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" 24SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
@@ -29,10 +30,14 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
29 --disable-devpoll --disable-epoll --with-gost=no \ 30 --disable-devpoll --disable-epoll --with-gost=no \
30 --with-gssapi=no --with-ecdsa=yes \ 31 --with-gssapi=no --with-ecdsa=yes \
31 --sysconfdir=${sysconfdir}/bind \ 32 --sysconfdir=${sysconfdir}/bind \
32 --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ 33 --with-openssl=${STAGING_LIBDIR}/.. \
33 --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ 34 --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
34 " 35 "
35inherit autotools-brokensep update-rc.d systemd useradd 36inherit autotools-brokensep update-rc.d systemd useradd pkgconfig
37
38PACKAGECONFIG ?= "libxml2"
39
40PACKAGECONFIG[libxml2] = "--with-libxml2=${STAGING_LIBDIR}/..,--with-libxml2=no,libxml2"
36 41
37USERADD_PACKAGES = "${PN}" 42USERADD_PACKAGES = "${PN}"
38USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \ 43USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \