From patchwork Mon Sep 24 20:14:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 147380 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1127888lji; Mon, 24 Sep 2018 13:15:16 -0700 (PDT) X-Google-Smtp-Source: ACcGV62h7bRWLso29t5hCldUToKwqqsHRs0Bm/Za5ZH7nf7FWyrBr9Zt4QMGOLuF2PNZSdg0QkWM X-Received: by 2002:a17:902:59dc:: with SMTP id d28-v6mr369511plj.116.1537820116128; Mon, 24 Sep 2018 13:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537820116; cv=none; d=google.com; s=arc-20160816; b=gBZXKpm9axpWtSNPScd66RuifoiU3s/asmEziYZkIScuEIexeAt52nzr/iMZVX3x68 7RKSobYYw7vhrloTTzsOE+Z/D5HqEHTJSyIeU96C/gwWrBtmSrrJmROSG1dKti5qm7lq JC7lCoqAsh44Y69aVTbg/O4MrswVR4xeKNweouRy3IBeR7pPrc6DIDjnhzCxGdg8W3Ss 8jcjldxGHMTB5ysJkzsNviqDJIIabswKJVXJHPabQhL4nIZSk52jYms41FmktRDPYlUP voyZIin6Qv5AOs+ki38gYBdiNa2vNF4r+soE6wEuvWrm0FK5AKS06XX2s2jAiS0MCKj6 co9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=gkAxe2CoNJz9UQo0I2oqgR/Ps855zXfTxhubSd/syU8=; b=rAGBqyJvZ84czx6Ol1swRsFQEl9N2jei+05sC3tUsP/2llJys+bXf5hq3tcZwu7GgT /8tmjtRnx/0uMEtSpof5+YsES4qiHFyHlRSoLrWcIZLlu+VrQbSEt+HVrhRCILltSTJj XhDeRDPs8bUlmSg4hDKpAgc8S2TauwTEwLwKqYuDg1Hio6VJHX/PK3rAQ5WqdrCMPJhW OWnS+gzEYRUpTrIp1psjHtsUqFrY0Lhmw160iH/lTjglEhchuMUac8gBRm/T6Yr6wZG1 tTTbP/F+R+YCkvwISzoNJRWqOjOUTSnDFJRv2m9iF6AwD3jxwBQ7cYLyfeToxNXoYkD5 jnYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jOgBsP+F; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 1-v6si274091pls.340.2018.09.24.13.15.15; Mon, 24 Sep 2018 13:15:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jOgBsP+F; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2A93F794DA; Mon, 24 Sep 2018 20:15:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by mail.openembedded.org (Postfix) with ESMTP id 67D17793F3 for ; Mon, 24 Sep 2018 20:14:56 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id t70-v6so4923652pgd.12 for ; Mon, 24 Sep 2018 13:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qb195SMmIRJ3/OAH/4euoloL2ZelqnWzZ80tBnXnpfk=; b=jOgBsP+FuVUuUm+fWolxz9/JYPI59YsTIerSQwVXVIHlvsAdbtI6+ty4vdsJRlkb5V wx+RL4BR87PoWeuQsnr1XRpDZQbhBY4wp0o/+aC+vps7M92h8CN6YVxuAoUTgvq0v7id kzVuQbLGPRMauVSgcCC41YvnA+ZEfMEhPzcnnk9zWH1h7Xg8mxCvqxDSKzuRb5E6IZZb FvAk9LslbubXIX1A6mxGtPRc1PwmMHQJJ+YRcST5F3tdIseKUggqD0IqzYrdTyeZznMv YGnn+G8nEfY5IGi+jlfaP+oz9mpZQNSPd5teiKtyydlO5eMhYEdPl6tZ6TG8FK0YXU9I RDbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qb195SMmIRJ3/OAH/4euoloL2ZelqnWzZ80tBnXnpfk=; b=Hvz88P6v2VtKCkHvSgX6G7+FO+qbyB5sY61KFvdAiqbZk4BS7fTsSf4XWzvGGe3b11 iXJ1VlhgIsywpG8Kv7CVpgSelhPYZGJsg0kKW2hTtxM2C5SUwqgM7SL4gP3iUmxWE9f2 Xf1+PT63PQlc0vxL5CAiX/r2s/5QEAyeYMrb9ATXCTXcV9Pj18Ep3M2KlAip6hMBGpfc fngGevGIDZvtIKYf2yQkBZ0c1RdHAJGKkDuImEzYJATJsJrqtPAJ4w9jtsXG63Wm3hIN LKSDpMRrGuveqiGRJehYDCPq2RqyqiCA5CIAB05gHcKT0DknKy2W4chtEUWQB81xDtpM PP0g== X-Gm-Message-State: ABuFfoj5BEK8fBIteuhId4aRAdq3vbUJ5TaWFcJ2rflmK1zM+E8zBuCG 6sBfV0Om8pZXyLhQIxEVB8J0c4XH X-Received: by 2002:a17:902:3081:: with SMTP id v1-v6mr383298plb.58.1537820097079; Mon, 24 Sep 2018 13:14:57 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::b1b1]) by smtp.gmail.com with ESMTPSA id s195-v6sm176398pgs.76.2018.09.24.13.14.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Sep 2018 13:14:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 24 Sep 2018 13:14:47 -0700 Message-Id: <20180924201447.2360-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180924201447.2360-1-raj.khem@gmail.com> References: <20180924201447.2360-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 2/2] vsftpd: Fix build with musl/x86 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org 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 --- meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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 80b0117c88..2e3e0e8843 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() {