diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-03-05 14:39:32 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-03-06 09:37:44 -0800 |
commit | d67a35bcb1ed3712e7fe8eef0ad2fd88d34b391b (patch) | |
tree | c6ce1716029cff382f2e4215ce01f459b627cb39 /meta-networking | |
parent | 1d4356c6ef6201bd41a129d42b1db747c610df6b (diff) | |
download | meta-openembedded-d67a35bcb1ed3712e7fe8eef0ad2fd88d34b391b.tar.gz |
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 <jpuhlman@mvista.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 3494a4398..134a33d47 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)}" | |||
40 | PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" | 40 | PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" |
41 | PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" | 41 | PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" |
42 | 42 | ||
43 | inherit autotools update-rc.d useradd systemd pkgconfig | 43 | inherit autotools update-rc.d useradd systemd pkgconfig multilib_header |
44 | 44 | ||
45 | SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" | 45 | SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" |
46 | SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" | 46 | SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" |
@@ -108,6 +108,8 @@ do_install () { | |||
108 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* | 108 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* |
109 | sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h | 109 | sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h |
110 | 110 | ||
111 | oe_multilib_header quagga/version.h | ||
112 | |||
111 | # For PAM | 113 | # For PAM |
112 | for feature in ${DISTRO_FEATURES}; do | 114 | for feature in ${DISTRO_FEATURES}; do |
113 | if [ "$feature" = "pam" ]; then | 115 | if [ "$feature" = "pam" ]; then |