From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id DA11B783B6 for ; Thu, 31 Aug 2017 21:49:54 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id v22so519843pfk.1 for ; Thu, 31 Aug 2017 14:49:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=p0t4F1i5UvxNzlczpP/52S1WeSleKspELxzSG9qAPKQ=; b=u7wTAb+I4F/UUatt/S2HmtvhpLnMbwz+uujA35u25MBSy/ahmJ8Hg29AGUWiKb8RCU 49a6fJ+HmmIlZrvx+h6t7TeSu7E33EOWfp3eo4m/fgk/IHWMcL2oLMmbtjq31AyI0K3z phLmpjQ1hb0zUT/IJ6/dvWBbRpOxCR/24OnYNMIbMkbebY8/WeGNVy950qGan5k5inli uVqDizxqg4mrlQIYm/eLgNpGGu4OZJXzE5Qhx7oZA/iSX9/2EAgqIufYtT65rCRbkneX +/F04Ld3lRIQpufhMeSQqL1Ug1aN47rPRDYrwFqMZZlfHWEzXY1yldaYMMF0uYaJsTiF uN3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=p0t4F1i5UvxNzlczpP/52S1WeSleKspELxzSG9qAPKQ=; b=SPGHVD+k0CRuFtWKGcJsJ+Vjso/qf6P81kxL06rpjhErO2vDfujGAvmuFcSvPyJD+H rv0Qpi/zfXWVYb/eX+kXbINTH3YvIbvkG20W4SF8RB1Plm+kGZZfDwaRd2oBPxiUcKEy pCXWjVYcCIZVYZDnmxlAOvzz5+s5QIvQVLdI5AZD3ZfKOQZj9vHtbgDoCODWFRePGLWA q+3AZXH3nQ701BDTsrWOXtw2fjHWqNuvqNmS7XfDrzGXZOd/diIxavbIFBK9gGZ+DmW0 P6J8Ot/Mjx/uAZ3hCOiQO7CwMhWX0Fdtrr30wW6N1e5qZykPjhwL2V73NQ5nQBIleAnt qh2Q== X-Gm-Message-State: AHYfb5iqAYUstf4tCUzQXulUHetrysRs6QJPvlfa9uEIWKSJkTp2R55q FT2VZP+A50nqx5ej X-Google-Smtp-Source: ADKCNb64/6RNGeB/ixBMGkSXUXdkSFDWorQFX28bknl3n+CJu8omajmm5NQM+VCzKsSkDq3FkVxUVA== X-Received: by 10.99.53.71 with SMTP id c68mr3982161pga.143.1504216195497; Thu, 31 Aug 2017 14:49:55 -0700 (PDT) Received: from ?IPv6:2601:202:4001:9ea0:d7b:f9dc:579b:aa63? ([2601:202:4001:9ea0:d7b:f9dc:579b:aa63]) by smtp.gmail.com with ESMTPSA id z11sm766323pfl.120.2017.08.31.14.49.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 14:49:54 -0700 (PDT) To: Khem Raj , openembedded-devel@lists.openembedded.org References: <20170831020401.6367-1-raj.khem@gmail.com> <20170831020401.6367-3-raj.khem@gmail.com> From: akuster808 Message-ID: Date: Thu, 31 Aug 2017 14:49:54 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170831020401.6367-3-raj.khem@gmail.com> Subject: Re: [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: , X-List-Received-Date: Thu, 31 Aug 2017 21:49:55 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US On 08/30/2017 07:04 PM, Khem Raj wrote: > 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 > > 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 > +| ^~~~~~~~~~~~~~~~~~~ > + Am I not seeing "Upstream-Status" in either patches? - armin > +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"