[oe] [zeus 06/17] syslog-ng: Fix multilib header conflict - syslog-ng-config.h
Armin Kuster
akuster808 at gmail.com
Fri Jan 3 02:49:03 UTC 2020
From: zhangxiao <xiao.zhang at windriver.com>
Header file conflict between 32-bit and 64-bit versions.
Signed-off-by: Zhang Xiao <xiao.zhang at windriver.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
(cherry picked from commit b6c9a83e3622a82d990c926a5e8686f9be19502f)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index b00cb91ee14..737c5e8bc3e 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -25,7 +25,7 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
-inherit autotools gettext systemd pkgconfig update-rc.d
+inherit autotools gettext systemd pkgconfig update-rc.d multilib_header
EXTRA_OECONF = " \
--enable-dynamic-linking \
@@ -98,6 +98,8 @@ do_install_append() {
else
install ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf
fi
+
+ oe_multilib_header syslog-ng/syslog-ng-config.h
}
FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*"
--
2.17.1
More information about the Openembedded-devel
mailing list