[oe-commits] [meta-openembedded] 45/47: vsftpd: Fix build with musl/x86

[git at git.openembedded.org]

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

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 7b427e1187b3ab3ac354a8eea969b2c91a99f0fb
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Mon Sep 24 11:37:32 2018 -0700

    vsftpd: Fix build with musl/x86
    
    F_SETLKW64 and F_SETLK64 are defined in
    include/asm-generic/fcntl.h on musl target
    but just including this header does not work
    since both include/asm-generic/fcntl.h and include/fcntl.h
    define same structures resulting in
    conflicting declaration of structs.
    Having local definitions of these values seems reasonable here.
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
index 80b0117..2e3e0e8 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
@@ -47,7 +47,7 @@ inherit update-rc.d useradd systemd
 
 CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf"
 LDFLAGS_append =" -lcrypt -lcap"
-
+CFLAGS_append_libc-musl = " -D_GNU_SOURCE -include fcntl.h"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 do_configure() {

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