[PATCH 0/2] Patches for guile and bind

[PATCH 0/2] Patches for guile and bind

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

The following changes since commit 5f406915b5e26761faa4ea5e0edd887ac5ae6e2f:

  bitbake: toaster: remove 2 confusing parameters (2015-12-18 13:51:54 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib kangkai/misc
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/misc

Kai Kang (2):
  guile: remove redundant replacement of .pc file
  bind: 9.10.2-P4 -> 9.10.3-P2

 .../0001-build-use-pkg-config-to-find-libxml2.patch  | 20 ++++++++++++++------
 .../bind/{bind_9.10.2-P4.bb => bind_9.10.3-P2.bb}    |  9 ++++++---
 meta/recipes-devtools/guile/guile_2.0.11.bb          | 19 ++++---------------
 3 files changed, 24 insertions(+), 24 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.10.2-P4.bb => bind_9.10.3-P2.bb} (90%)

-- 
2.6.1

[PATCH 1/2] guile: remove redundant replacement of .pc file

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Remove redundant replacement of pkgconfig file and only modify the .pc
file which is installed in ${D}.

Replace /usr/bin with ${bindir} at same time.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/recipes-devtools/guile/guile_2.0.11.bb | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb
index 98b465b..fa45008 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -57,19 +57,6 @@ do_configure_prepend() {
 
 export GUILE_FOR_BUILD="${BUILD_SYS}-guile"
 
-do_compile_append() {
-	# just for target recipe
-	if [ "${PN}" = "guile" ]
-	then
-		sed -i -e s:${STAGING_DIR_TARGET}::g \
-	               -e s:/${TARGET_SYS}::g \
-	               -e s:-L/usr/lib::g \
-        	       -e s:-isystem/usr/include::g \
-	               -e s:,/usr/lib:,\$\{libdir\}:g \
-	                  meta/guile-2.0.pc
-	fi
-}
-
 do_install_append_class-native() {
 	install -m 0755  ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
 
@@ -83,8 +70,10 @@ do_install_append_class-native() {
 
 do_install_append_class-target() {
 	# cleanup buildpaths in scripts
-	sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}/usr/bin/guile-config
-	sed -i -e 's:${STAGING_DIR_HOST}::' ${D}/usr/bin/guile-snarf
+	sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}${bindir}/guile-config
+	sed -i -e 's:${STAGING_DIR_HOST}::' ${D}${bindir}/guile-snarf
+
+	sed -i -e 's:${STAGING_DIR_TARGET}::g' ${D}${libdir}/pkgconfig/guile-2.0.pc
 }
 
 SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"
-- 
2.6.1

[PATCH 2/2] bind: 9.10.2-P4 -> 9.10.3-P2

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

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>
---
 .../0001-build-use-pkg-config-to-find-libxml2.patch  | 20 ++++++++++++++------
 .../bind/{bind_9.10.2-P4.bb => bind_9.10.3-P2.bb}    |  9 ++++++---
 2 files changed, 20 insertions(+), 9 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.10.2-P4.bb => bind_9.10.3-P2.bb} (90%)

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 cb5251d..805cbb3 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
similarity index 90%
rename from meta/recipes-connectivity/bind/bind_9.10.2-P4.bb
rename to meta/recipes-connectivity/bind/bind_9.10.3-P2.bb
index 1e1e726..875a0c8 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 \
-- 
2.6.1