From d67a35bcb1ed3712e7fe8eef0ad2fd88d34b391b Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Thu, 5 Mar 2020 14:39:32 -0800 Subject: quagga: make version.h a multilib header version.h contains the configure options passed during the build which differs between multilibs Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 3494a4398e..134a33d478 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" -inherit autotools update-rc.d useradd systemd pkgconfig +inherit autotools update-rc.d useradd systemd pkgconfig multilib_header SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" @@ -108,6 +108,8 @@ do_install () { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h + oe_multilib_header quagga/version.h + # For PAM for feature in ${DISTRO_FEATURES}; do if [ "$feature" = "pam" ]; then -- cgit v1.2.3-54-g00ecf