diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2015-12-22 09:04:54 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-27 11:26:59 +0000 |
| commit | b49751e7febd262b754043e4e523e6690bfbbfaa (patch) | |
| tree | 31669db23503fe79913c7da4b65c40d6299549bc | |
| parent | 7c7d436e660a8869179c4e5579aa2a992d636c22 (diff) | |
| download | openembedded-core-contrib-b49751e7febd262b754043e4e523e6690bfbbfaa.tar.gz | |
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bind/bind_9.10.3-P2.bb (renamed from meta/recipes-connectivity/bind/bind_9.10.2-P4.bb) | 9 |
2 files changed, 20 insertions, 9 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 index cb5251d159..805cbb3315 100644 --- 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 @@ -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 - ;; diff --git a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb index 1e1e7262fe..875a0c8f80 100644 --- a/meta/recipes-connectivity/bind/bind_9.10.2-P4.bb +++ b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb @@ -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 \ |