From patchwork Thu Aug 31 02:04:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111346 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1847951qge; Wed, 30 Aug 2017 19:05:07 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7pK3wJTyJ/t3dAWpRU329eU/kYBAdjiDttJ3GdgDQ7VeDOGktjqaFw+LCkSNmuesCZ/o39 X-Received: by 10.84.236.8 with SMTP id q8mr729881plk.211.1504145107854; Wed, 30 Aug 2017 19:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504145107; cv=none; d=google.com; s=arc-20160816; b=UUWoU9dqjRMUKcJhL2YjxnAH6fMX2g+g67sjY5+FBlND2HVdVcGJrT+nWza40BK3LG lZgmeAwaTgKIgjfDot5UZhcqTrlXaMulawUHYYOZv90PT/+4WB+FI9SecSbOu04iiwIi q2mSfCT1C6MVeCSaXr0Zl+P2IxYbtLluiQI+DelO7TAFEuNINK7C6he7tTGg83JMmXw6 dy/gJ8jbcOfs48FknZF09oaH4NCEpYGHwaSau7vH5/RxFSx2B520XNTC8paSjH/marpN qBXTTlrRDHj9ev25EjVIwfSNOj9foNG0sN9uDSbg4rZbLqX37PXqxsZM02eDksnkwsf8 RRLg== 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=9iR/PzE/ufjt9huMCk6io3wDrxq4HYhtwBfQIdRHwi8=; b=uEE+75jnAERSagwTgwWK8SfhTVbF/he8ZlXTi/gapSw877Ej40J53dw3guzH5BWus+ cctNlo4iZGOgNSwLuX5PgPoL5VaJBfsbmcGULfZIbG6mJvJrfWTM41gy6zR8PaG5Eg1Z OHefw8imgrwHv5aCK/oFS0iRF8S36SzA5Ya4/+bGPVnq3NT+VQrsek9Xybc80ZNDiH6d IeJ4QSemb+qfPIyYrU6MuApFrChaYR/hxieVskPPXeFH/880Vboulr2Pg8UNVr0Gjgp0 cCcHh8GN7SKDrqfrwNlieSJIRtigxvjmOAHPT8r2BoBgKqRkjGV/XqgS+j2lG5iGICsu Wccg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l9tqrGKP; 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 c3si5453418pfm.392.2017.08.30.19.05.07; Wed, 30 Aug 2017 19:05:07 -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=l9tqrGKP; 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 403E0783A0; Thu, 31 Aug 2017 02:04:57 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 1986B7838D for ; Thu, 31 Aug 2017 02:04:17 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id r133so6280991pgr.2 for ; Wed, 30 Aug 2017 19:04:19 -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=azs0En5vK8137opvx5IwGSVgVpLzAsb9416Tjcuavzk=; b=l9tqrGKP7aLR333WwmITmOro5zz/GNHTS43Hdau1AjDLuneu6EnycKUZ8ylRRYZQY+ 7JnMuzY/M4bN2mHOqhQ3HLuU0GRorUkSbkoQUGFznG3VAsAQjW0SWXnd4+94Ma819WXt aMbuiOBsaBfbdlZFXwR7dFpmlWJ03IwXQhBo2XOmFMaUt0xOXfDs7TqY+JdF9o90mEj0 rgM2xQ9mPDrWQ9kyufBPVlAEMgJ3khCGG3h1RzejZnveDqWUHRFe5kFPx6uq/OlEX+76 8PzyVN0wMn6uqhObjwzGnUpDsbhiy7A1W25KArSzjnxKGiaK/Sqmn2Vo4a9pRlKnv0+O r4BA== 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=azs0En5vK8137opvx5IwGSVgVpLzAsb9416Tjcuavzk=; b=Bixvzn0CAjs+mHbGyc+M3D3DdeGlks+4HvAK8PObmzE5VRuwdlWYPKom3gPO27gSMT EN7Zokp3zTsukdOr3cs8p5jbMovtWOMn8Q3pzrzgKQlltxAIt7V242M/hwD5nA79Qi/6 /HRjaz0zLRQVFQ/JkQIomnZXGZr3RIrCtZj06KcO17EuUtK+MpwphgKa11S9FEOxP/De SSf3hYdMq4etSx5rCghyJUb/s1DHHNpYnCii3GUi9qbUk38Xe9Ir/lZ7CWbDl6+PKFe/ JXNtpSLCGYc2+u7UjOdkjCL4T4mReSXti/eQ4fgxWMI2ttkOKT0mZPl6x4NjjCypfGui 5Cmw== X-Gm-Message-State: AHYfb5hqAjyJOxd5EMhmS7CJx7fWaVjya8k0aEF2tpDe3KU8Otey1WRo JmkWjKwQ1GU/iX/p X-Received: by 10.99.164.26 with SMTP id c26mr628517pgf.141.1504145059207; Wed, 30 Aug 2017 19:04:19 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::79ab]) by smtp.gmail.com with ESMTPSA id c10sm12347641pfk.101.2017.08.30.19.04.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 19:04:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 30 Aug 2017 19:04:00 -0700 Message-Id: <20170831020401.6367-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831020401.6367-1-raj.khem@gmail.com> References: <20170831020401.6367-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 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 | 44 ++++++++++++++ .../0002-Fix-build-issues-found-with-musl.patch | 69 ++++++++++++++++++++++ .../recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb | 4 +- 3 files changed, 116 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..9899292b0 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch @@ -0,0 +1,44 @@ +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 +--- + 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..e149f3468 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch @@ -0,0 +1,69 @@ +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 +--- + 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"