From patchwork Sat Mar 7 11:40:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 447569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 0D8D8140187 for ; Sat, 7 Mar 2015 22:40:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3B6AA3271; Sat, 7 Mar 2015 11:40:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UcjU9371kCND; Sat, 7 Mar 2015 11:40:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C8BA1A2DAB; Sat, 7 Mar 2015 11:40:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3B8941C299C for ; Sat, 7 Mar 2015 11:40:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 36E56A2D77 for ; Sat, 7 Mar 2015 11:40:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PRN9_8-BmNBz for ; Sat, 7 Mar 2015 11:40:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by fraxinus.osuosl.org (Postfix) with ESMTP id B8ABEA2C04 for ; Sat, 7 Mar 2015 11:40:25 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id F2D8FC38; Sat, 7 Mar 2015 12:40:31 +0100 (CET) Received: from localhost (AToulouse-657-1-1102-52.w86-201.abo.wanadoo.fr [86.201.120.52]) by mail.free-electrons.com (Postfix) with ESMTPSA id BB11678; Sat, 7 Mar 2015 12:40:31 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sat, 7 Mar 2015 12:40:18 +0100 Message-Id: <1425728422-14113-2-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425728422-14113-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1425728422-14113-1-git-send-email-thomas.petazzoni@free-electrons.com> MIME-Version: 1.0 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 1/5] libnl: use the backported patch for poll.h issue X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Now that Jörg's patch has been merged upstream, let's use the backported version, in a git format. Signed-off-by: Thomas Petazzoni --- ...etlink-h-use-poll-h-instead-of-sys-poll-h.patch | 18 ------------- ...link.h-fix-build-including-poll.h-with-th.patch | 30 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 18 deletions(-) delete mode 100644 package/libnl/0001-netlink-netlink-h-use-poll-h-instead-of-sys-poll-h.patch create mode 100644 package/libnl/0001-netlink-netlink.h-fix-build-including-poll.h-with-th.patch diff --git a/package/libnl/0001-netlink-netlink-h-use-poll-h-instead-of-sys-poll-h.patch b/package/libnl/0001-netlink-netlink-h-use-poll-h-instead-of-sys-poll-h.patch deleted file mode 100644 index dd55cd4..0000000 --- a/package/libnl/0001-netlink-netlink-h-use-poll-h-instead-of-sys-poll-h.patch +++ /dev/null @@ -1,18 +0,0 @@ -netlink/netlink.h: As the poll() man page recommends include the -instead of . This removes an error when building libdl against -the musl C library. - -Signed-off-by: Jörg Krause - -diff -purN libnl-3.2.25.orig/include/netlink/netlink.h libnl-3.2.25/include/netlink/netlink.h ---- libnl-3.2.25.orig/include/netlink/netlink.h 2014-09-01 11:42:37.254724124 +0200 -+++ libnl-3.2.25/include/netlink/netlink.h 2014-09-01 11:42:58.254724255 +0200 -@@ -16,7 +16,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/package/libnl/0001-netlink-netlink.h-fix-build-including-poll.h-with-th.patch b/package/libnl/0001-netlink-netlink.h-fix-build-including-poll.h-with-th.patch new file mode 100644 index 0000000..53a299b --- /dev/null +++ b/package/libnl/0001-netlink-netlink.h-fix-build-including-poll.h-with-th.patch @@ -0,0 +1,30 @@ +From 14128766e80823f79a3b2c97573da1aea5c16ea8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Mon, 1 Sep 2014 12:38:10 +0200 +Subject: [PATCH 1/2] netlink/netlink.h: fix build including with the + musl C library + +https://github.com/thom311/libnl/pull/64 + +Signed-off-by: Thomas Haller +Signed-off-by: Thomas Petazzoni +--- + include/netlink/netlink.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h +index 28dba06..61656b3 100644 +--- a/include/netlink/netlink.h ++++ b/include/netlink/netlink.h +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +2.1.0 +