[oe-commits] [openembedded-core] 05/15: bind: fix multilib install file conflicts

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d3baeaf09d5d3e7548e5b2ea1b565880ea6ce994
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Sat Sep 29 13:43:48 2018 +0800

    bind: fix multilib install file conflicts
    
    It adds ${libdir} to linker options in scripts bind9-config and
    isc-config.sh. And then causes install file conflicts when install bind
    andl ib32-bind both.
    
    Inherit multilib_script.bbclass to fix this issue.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/bind/bind_9.11.4.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.11.4.bb b/meta/recipes-connectivity/bind/bind_9.11.4.bb
index 23c3aad..63d8b0b 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.4.bb
@@ -28,7 +28,9 @@ SRC_URI[sha256sum] = "595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/"
 
-inherit autotools update-rc.d systemd useradd pkgconfig
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
 
 # PACKAGECONFIGs readline and libedit should NOT be set at same time
 PACKAGECONFIG ?= "readline"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.