summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch42
-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.10.2.bb7
3 files changed, 45 insertions, 39 deletions
diff --git a/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
new file mode 100644
index 0000000000..cb5251d159
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
@@ -0,0 +1,42 @@
1xml2-config is disabled, so change the configure script to use pkgconfig to find
2libxml2.
3
4Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7---
8 configure.in | 18 +++---------------
9 1 file changed, 3 insertions(+), 15 deletions(-)
10
11diff --git a/configure.in b/configure.in
12index d566e1c..c9ef3a6 100644
13--- a/configure.in
14+++ b/configure.in
15@@ -2102,21 +2102,9 @@ case "$use_libxml2" in
16 DST_LIBXML2_INC=""
17 ;;
18 auto|yes)
19- case X`(xml2-config --version) 2>/dev/null` in
20- X2.[[6789]].*)
21- libxml2_libs=`xml2-config --libs`
22- libxml2_cflags=`xml2-config --cflags`
23- ;;
24- *)
25- libxml2_libs=
26- libxml2_cflags=
27- ;;
28- esac
29- ;;
30- *)
31- if test -f "$use_libxml2/bin/xml2-config" ; then
32- libxml2_libs=`$use_libxml2/bin/xml2-config --libs`
33- libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags`
34+ if pkg-config --exists libxml-2.0 ; then
35+ libxml2_libs=`pkg-config libxml-2.0 --libs`
36+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
37 fi
38 ;;
39 esac
40--
412.1.4
42
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
deleted file mode 100644
index d24276cf9e..0000000000
--- a/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
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/$base_libdir/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.10.2.bb b/meta/recipes-connectivity/bind/bind_9.10.2.bb
index 21be397a9a..c5bc242bf2 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.2.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.2.bb
@@ -16,9 +16,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
16 file://named.service \ 16 file://named.service \
17 file://bind9 \ 17 file://bind9 \
18 file://init.d-add-support-for-read-only-rootfs.patch \ 18 file://init.d-add-support-for-read-only-rootfs.patch \
19 file://bind-add-crosscripts-search-path-for-xml2-config.patch \
20 file://bind-confgen-build-unix.o-once.patch \ 19 file://bind-confgen-build-unix.o-once.patch \
21 " 20 file://0001-build-use-pkg-config-to-find-libxml2.patch \
21 "
22 22
23SRC_URI[md5sum] = "dca7a9967947bffa98547fca6130fc04" 23SRC_URI[md5sum] = "dca7a9967947bffa98547fca6130fc04"
24SRC_URI[sha256sum] = "6f9bb7908aa45c1edfa391e356fc0afc1ded175386cdefb6cf9e1289f7457a98" 24SRC_URI[sha256sum] = "6f9bb7908aa45c1edfa391e356fc0afc1ded175386cdefb6cf9e1289f7457a98"
@@ -34,8 +34,7 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
34inherit autotools-brokensep update-rc.d systemd useradd pkgconfig 34inherit autotools-brokensep update-rc.d systemd useradd pkgconfig
35 35
36PACKAGECONFIG ?= "libxml2" 36PACKAGECONFIG ?= "libxml2"
37 37PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
38PACKAGECONFIG[libxml2] = "--with-libxml2=${STAGING_LIBDIR}/..,--with-libxml2=no,libxml2"
39 38
40USERADD_PACKAGES = "${PN}" 39USERADD_PACKAGES = "${PN}"
41USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \ 40USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \