aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangxiao <xiao.zhang@windriver.com>2019-11-27 01:31:42 -0800
committerArmin Kuster <akuster808@gmail.com>2020-01-05 14:43:51 -0800
commit86b4e31912709c7891f093b3bbbcecbc9cc81838 (patch)
tree0e68212fc7be8bc48abcc484f118ddde223702ce
parent56242b559faa490dac7d3c5882fcdd58abf5ae79 (diff)
downloadmeta-openembedded-contrib-86b4e31912709c7891f093b3bbbcecbc9cc81838.tar.gz
meta-openembedded-contrib-86b4e31912709c7891f093b3bbbcecbc9cc81838.tar.bz2
meta-openembedded-contrib-86b4e31912709c7891f093b3bbbcecbc9cc81838.zip
syslog-ng: Fix multilib header conflict - syslog-ng-config.h
Header file conflict between 32-bit and 64-bit versions. Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit b6c9a83e3622a82d990c926a5e8686f9be19502f) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index b00cb91ee1..737c5e8bc3 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/*"