From patchwork Sat Oct 5 14:16:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 280769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id DF8D52C00D0 for ; Sun, 6 Oct 2013 00:16:50 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DF2EC93D45; Sat, 5 Oct 2013 14:16:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RNxLZ63YtXim; Sat, 5 Oct 2013 14:16:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EC6B893D5F; Sat, 5 Oct 2013 14:16:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E8F931BFA1E for ; Sat, 5 Oct 2013 14:16:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DB52E93D3E for ; Sat, 5 Oct 2013 14:16:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9V7iyCngfRBf for ; Sat, 5 Oct 2013 14:16:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by hemlock.osuosl.org (Postfix) with ESMTP id 295B793BD1 for ; Sat, 5 Oct 2013 14:16:18 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id DAD648B5; Sat, 5 Oct 2013 16:16:23 +0200 (CEST) Received: from localhost (AToulouse-651-1-247-171.w90-50.abo.wanadoo.fr [90.50.2.171]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9A76A891 for ; Sat, 5 Oct 2013 16:16:23 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sat, 5 Oct 2013 16:16:14 +0200 Message-Id: <1380982574-16628-6-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1380982574-16628-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1380982574-16628-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 5/5] busybox: add patches to fix build with the musl C library X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Those patches have been submitted upstream. Signed-off-by: Thomas Petazzoni --- ...01-libbb-use-poll.h-instead-of-sys-poll.h.patch | 32 +++++++++++++++++++ ...onfig-include-linux-if_slip.h-instead-of-.patch | 33 ++++++++++++++++++++ ...libiproute-use-linux-if_packet.h-instead-.patch | 36 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch create mode 100644 package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch create mode 100644 package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch diff --git a/package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch b/package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch new file mode 100644 index 0000000..089d858 --- /dev/null +++ b/package/busybox/1.21.1/0001-libbb-use-poll.h-instead-of-sys-poll.h.patch @@ -0,0 +1,32 @@ +From 676452a92d1fc4f85e8d89930d7729197c031026 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 5 Oct 2013 15:51:56 +0200 +Subject: [PATCH 1/3] libbb: use instead of + +As the pol() manpage recommends, include the header instead +of . This allows to get rid of gazillions of warnings when +building Busybox against the musl C library, which prints a warning +when the internal header is included directly instead of +the header. + +Signed-off-by: Thomas Petazzoni +--- + include/libbb.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/libbb.h b/include/libbb.h +index e520060..f03f454 100644 +--- a/include/libbb.h ++++ b/include/libbb.h +@@ -37,7 +37,7 @@ + #include /* dirname,basename */ + #undef basename + #define basename dont_use_basename +-#include ++#include + #include + #include + #include +-- +1.8.1.2 + diff --git a/package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch b/package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch new file mode 100644 index 0000000..ed35719 --- /dev/null +++ b/package/busybox/1.21.1/0002-network-ifconfig-include-linux-if_slip.h-instead-of-.patch @@ -0,0 +1,33 @@ +From 5eae213031a3ef88fe8d9d0a387f44264ea635cc Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 5 Oct 2013 15:53:16 +0200 +Subject: [PATCH 2/3] network/ifconfig: include instead of + + +The musl C library doesn't provide the since userspace +applications can just as well use the kernel header. + +This commit fixes the build of the ifconfig applet with the musl C +library. + +Signed-off-by: Thomas Petazzoni +--- + networking/ifconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/networking/ifconfig.c b/networking/ifconfig.c +index 782374b..c90ed6b 100644 +--- a/networking/ifconfig.c ++++ b/networking/ifconfig.c +@@ -56,7 +56,7 @@ + #endif + + #if ENABLE_FEATURE_IFCONFIG_SLIP +-# include ++# include + #endif + + /* I don't know if this is needed for busybox or not. Anyone? */ +-- +1.8.1.2 + diff --git a/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch b/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch new file mode 100644 index 0000000..7b74656 --- /dev/null +++ b/package/busybox/1.21.1/0003-networking-libiproute-use-linux-if_packet.h-instead-.patch @@ -0,0 +1,36 @@ +From d4fec31889ad660a58dab633c511221feb66e817 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 5 Oct 2013 15:55:06 +0200 +Subject: [PATCH 3/3] networking/libiproute: use instead of + + +The musl C library doesn't provide the since the +corresponding kernel headers already provides the +necessary definitions. Replacing by + also removes the need to include + + +This commit fixes the build of iplink with the musl C library. + +Signed-off-by: Thomas Petazzoni +--- + networking/libiproute/iplink.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c +index bad2017..32ccb1c 100644 +--- a/networking/libiproute/iplink.c ++++ b/networking/libiproute/iplink.c +@@ -5,8 +5,7 @@ + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ + #include +-#include +-#include ++#include + #include + + #include "ip_common.h" /* #include "libbb.h" is inside */ +-- +1.8.1.2 +