[oe-commits] [meta-openembedded] 11/12: syslog-ng: Fix multilib header conflict - syslog-ng-config.h

[git at git.openembedded.org]

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

armin_kuster pushed a commit to branch zeus-next
in repository meta-openembedded.

commit 86b4e31912709c7891f093b3bbbcecbc9cc81838
Author: zhangxiao <xiao.zhang at windriver.com>
AuthorDate: Wed Nov 27 01:31:42 2019 -0800

    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 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 b00cb91..737c5e8 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/*"

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