bind: 9.10.2-P4 -> 9.10.3-P2
Upgrade bind from 9.10.2-P4 to 9.10.3-P2. * update context of 0001-build-use-pkg-config-to-find-libxml2.patch * add PACKAGECONFIGs readline and libedit. They provide same library, so should not be set at same time. (From OE-Core rev: b49751e7febd262b754043e4e523e6690bfbbfaa) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7204a0f18e
commit
c2e8079e87
|
@ -4,15 +4,18 @@ libxml2.
|
|||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
Update context for version 9.10.3-P2.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
configure.in | 18 +++---------------
|
||||
1 file changed, 3 insertions(+), 15 deletions(-)
|
||||
configure.in | 23 +++--------------------
|
||||
1 file changed, 3 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index d566e1c..c9ef3a6 100644
|
||||
index 0db826d..75819eb 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -2102,21 +2102,9 @@ case "$use_libxml2" in
|
||||
@@ -2107,26 +2107,9 @@ case "$use_libxml2" in
|
||||
DST_LIBXML2_INC=""
|
||||
;;
|
||||
auto|yes)
|
||||
|
@ -22,8 +25,13 @@ index d566e1c..c9ef3a6 100644
|
|||
- libxml2_cflags=`xml2-config --cflags`
|
||||
- ;;
|
||||
- *)
|
||||
- libxml2_libs=
|
||||
- libxml2_cflags=
|
||||
- if test "$use_libxml2" = "yes" ; then
|
||||
- AC_MSG_RESULT(no)
|
||||
- AC_MSG_ERROR(required libxml2 version not available)
|
||||
- else
|
||||
- libxml2_libs=
|
||||
- libxml2_cflags=
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
- ;;
|
||||
|
|
|
@ -23,8 +23,8 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
|
|||
file://0001-lib-dns-gen.c-fix-too-long-error.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "8b1f5064837756c938eadc1537dec5c7"
|
||||
SRC_URI[sha256sum] = "c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8"
|
||||
SRC_URI[md5sum] = "672dd3c2796b12ac8440f55bcaecfa82"
|
||||
SRC_URI[sha256sum] = "4a6c1911ac0d4b6be635b63de3429b6c168ea244043f12bbc8a4eb3368fd6ecd"
|
||||
|
||||
ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
|
||||
EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
|
||||
|
@ -35,8 +35,11 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
|
|||
"
|
||||
inherit autotools update-rc.d systemd useradd pkgconfig
|
||||
|
||||
PACKAGECONFIG ?= ""
|
||||
# PACKAGECONFIGs readline and libedit should NOT be set at same time
|
||||
PACKAGECONFIG ?= "readline"
|
||||
PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
|
||||
PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
|
||||
PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \
|
Loading…
Reference in New Issue