From patchwork Thu Aug 31 23:26:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111457 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp216724qge; Thu, 31 Aug 2017 16:27:27 -0700 (PDT) X-Received: by 10.99.55.22 with SMTP id e22mr129249pga.101.1504222047802; Thu, 31 Aug 2017 16:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504222047; cv=none; d=google.com; s=arc-20160816; b=PYICfDT5KU9g3uG7BTYAhtHRMjO6sPe9dH/PLEKGhWcSw+rgXiFiMYGsAlSrHpKygU 5bCj6nYG5EfNyg5ASaSmbGoqNEJ7z0pPztupTipo0EO2zoQSB3fypcGyvuzxGGiuPMM7 jmNSDWVB7p8i284z/AUBGSOBSGBnaJyiQu4JmZJPHvsK7HT3Mh/sEdMBvzg2YOtxZawE 9mWMexecOvh/VWTgj22e0GziJuCYrkgSum5sXDvz5c6RD4lxrZnu3iaJ1YS7oGtdwU/6 Lb2dCFP9fRTEfFh4/Lhk81SLRdiUNdAUBC/oKriRzjR1unJbdrBoOwiYl40m5HrB2D+W L1CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Jwqp3DOnKgu40W9s0ZLQYNNybDO05DX6NAoCgRpMwu0=; b=vIe/pAyVeDT679MMGRtWBDQ+vRD+Itb2qytEHjfwcyb+tawGv0zDeW5kqMHTyvPGzu CveAgXiElHh2aWD+jY99s7NDucV40Zdd+xHAZMgxLolcXgi+bXccBIvZlNK0EIzDhVXU yBjdjI1MwPwkfu8FAHstu4fr9HiPVzHLriTwGYhMF7orTlAx+yzjgvGiqEl3i3m7/6qL b2lb/e4b0l0cUfCOv5MgnQ15fCkLsVTUvVtJ6CnnWUnp0HvyiAsUVs2pW1QqNRNV8BJA bUjMexa3tvHrR33tlW0m5sDZ1BvFY6epGHIYOQpnjClf7s9jY+SGY8Ph59crOdW0PI7R +2cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j3m6S8l5; 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=NONE 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 j12si634550pgf.717.2017.08.31.16.27.27; Thu, 31 Aug 2017 16:27:27 -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=j3m6S8l5; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EF6427848B; Thu, 31 Aug 2017 23:27:17 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 55A257847A for ; Thu, 31 Aug 2017 23:27:02 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id t193so647859pgc.4 for ; Thu, 31 Aug 2017 16:27:04 -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; bh=tWvBmZlr632Z1bHtKZn2nOQEL8WzCjOp3gAoOMqEqGU=; b=j3m6S8l5PAKnQkkba3mQuFj1fcPJhmYTUSDbyngQu8k0Vzng5Me7XNcb78maJomS/g gQEwo7XMCecMd0EJZn1Zi+mi/54JJDlod1RSdpDv+653h+xCwnQIFQHLBCaE053ldI4G mBejkUKojafcfQV232RQaUkEbijJAmQOXFlQ3WhzypEC5wNfBJInAD/4fKWiwH7qVabf yaBm86070GF+laB1GhEEgyPZLq1rFcPe8Ek0Nn8sq+f0pAQpZNxcUkk4d8GfJ+cmpjEf NBiQK01FqeGRzCMMX+TxoeZXlEFtMTMQSnOxq0jjVhWhjg6dJ/gTJs/RUc77vzQEJjrr qRgw== 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; bh=tWvBmZlr632Z1bHtKZn2nOQEL8WzCjOp3gAoOMqEqGU=; b=pKF4V47h3nBq7EBGJBIAQgAkv3J6iQBIhY6AMOWxMrXzIZ7OyysDnKsupmCyHzp6OC ULFtszdkXcnCF0AhfKxngCW2NpOAfEjXApWCPYXigmZeMc2DikUlz+dLkreZDjSvj2dw XBCPPRklcSmd9lIDYJQ6keCOFdn+PGu+PSkqpfq8ezxYozRMXqFdApsHT5LXne54vSKV YdeDUTcHGt3SwWwYHr0T3XRUxxQr3oWB+BfEbW5dYVD+6R0zG6rEg1aOQRo5wAheGWhr xmSrG5c6iw5vXY8zVF0CKHsefT0OF+qWj8MldCK8fWEHNVpODyvd3h0EOl6tFOukCh9y +SiQ== X-Gm-Message-State: AHPjjUgbTxvCelFtd/6Y8Atu7ekxG30gb2rVTY/YLT9iLcnb6qvubJmA NcCybhL9VW/CuNF3 X-Google-Smtp-Source: ADKCNb6mq2QKEzLu1xQVV+qnaXZBAHyunzBWuu1lGYjjPwgi9K9FTrsph/kO32i4zFiIMnr9i3g5UA== X-Received: by 10.84.232.133 with SMTP id i5mr100443plk.239.1504222024214; Thu, 31 Aug 2017 16:27:04 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::2e06]) by smtp.gmail.com with ESMTPSA id 16sm888569pge.33.2017.08.31.16.27.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:27:03 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 Aug 2017 16:26:44 -0700 Message-Id: <20170831232645.6125-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831232645.6125-1-raj.khem@gmail.com> References: <20170831232645.6125-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 3/4] netkit-rwho: Fix build with musl 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...001-Add-missing-include-path-to-I-options.patch | 46 ++++++++++++++ .../0002-Fix-build-issues-found-with-musl.patch | 71 ++++++++++++++++++++++ .../recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb | 4 +- 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch new file mode 100644 index 000000000..b1325b317 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch @@ -0,0 +1,46 @@ +From 55ab6f1389261edff5f4c942bc3b0d8e695856d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:11:33 -0700 +Subject: [PATCH 1/2] Add missing include path to -I options + +Fixes errors like +| rwho.c:52:10: fatal error: 'protocols/rwhod.h' file not found +| #include +| ^~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + rwho/Makefile | 1 + + rwhod/Makefile | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/rwho/Makefile b/rwho/Makefile +index 6f86388..67b28d4 100644 +--- a/rwho/Makefile ++++ b/rwho/Makefile +@@ -6,6 +6,7 @@ include ../MRULES + rwho: rwho.o + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ + ++CFLAGS += -I../include + rwho.o: ../version.h + + install: rwho +diff --git a/rwhod/Makefile b/rwhod/Makefile +index 772b641..9034218 100644 +--- a/rwhod/Makefile ++++ b/rwhod/Makefile +@@ -7,6 +7,8 @@ ifneq ($(USE_GLIBC),1) + CFLAGS += -D_GNU_SOURCE + endif + ++CFLAGS += -I../include ++ + OBJS = rwhod.o + + rwhod: $(OBJS) +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch new file mode 100644 index 000000000..717b4d73f --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch @@ -0,0 +1,71 @@ +From 2108213242638fa355f662382f55495d91301858 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:13:17 -0700 +Subject: [PATCH 2/2] Fix build issues found with musl + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + ruptime/ruptime.c | 1 + + rwho/rwho.c | 1 + + rwhod/rwhod.c | 5 +++-- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c +index 1d4f7b6..f1f043c 100644 +--- a/ruptime/ruptime.c ++++ b/ruptime/ruptime.c +@@ -53,6 +53,7 @@ char ruptime_rcsid[] = + #include + #include + #include ++#include + + struct hs { + char hs_hostname[MAXHOSTNAMELEN]; +diff --git a/rwho/rwho.c b/rwho/rwho.c +index 63919ac..71aec9e 100644 +--- a/rwho/rwho.c ++++ b/rwho/rwho.c +@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $"; + #include + #include + #include ++#include + #include + + #include "../version.h" +diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c +index 54498d0..40cabcf 100644 +--- a/rwhod/rwhod.c ++++ b/rwhod/rwhod.c +@@ -76,6 +76,7 @@ char rcsid[] = + #include + #include + #include ++#include + + #include "../version.h" + +@@ -102,7 +103,7 @@ struct nlist nl[] = { + static void broadcaster(void); + static int configure(int s); + static int verify(const char *name); +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) ++#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) + static int getloadavg(double ptr[3], int n); + #endif + +@@ -549,7 +550,7 @@ sendpacket(struct whod *wd) + } + } + +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) ++#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) + /* + * Taken from: + * +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb index 04baa4286..5685f03d6 100644 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb @@ -8,7 +8,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;nam ${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;name=patch13 \ file://rwhod \ file://rwhod.default \ -" + file://0001-Add-missing-include-path-to-I-options.patch \ + file://0002-Fix-build-issues-found-with-musl.patch \ + " SRC_URI[archive.md5sum] = "0f71620d45d472f89134ba0d74242e75" SRC_URI[archive.sha256sum] = "0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7" SRC_URI[patch13.md5sum] = "82ed5a3c6b0bbf00b36508b9787963b9"