From patchwork Mon Jul 20 18:35:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Heading X-Patchwork-Id: 497874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 27745140280 for ; Tue, 21 Jul 2015 04:35:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yhzvOre2; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 31FB2891E1; Mon, 20 Jul 2015 18:35:57 +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 L7WPLl0yoMn0; Mon, 20 Jul 2015 18:35:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5360C891C6; Mon, 20 Jul 2015 18:35:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CF49A1CE785 for ; Mon, 20 Jul 2015 18:35:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9305426985 for ; Mon, 20 Jul 2015 18:35:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RQMKNZUHzPTU for ; Mon, 20 Jul 2015 18:35:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by silver.osuosl.org (Postfix) with ESMTPS id B022D2693B for ; Mon, 20 Jul 2015 18:35:52 +0000 (UTC) Received: by wibxm9 with SMTP id xm9so99461118wib.0 for ; Mon, 20 Jul 2015 11:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=nAnet568gSUcUiruwCFuLZ4StclPODZj6W0w1yXKJck=; b=yhzvOre2TPPLgYA3+AYtqyyrYWWcgcSwsozAlEXcBZPyFD/u0wLKzo79ezM/EOCTHl WvKIPXmdZAUnUIrOG2yIE1lLvAEVWPr6ogaXAvYfeDBu1GtXv+IPHv16AfR7wxPt98Ni f2MUXq3+XxCAanHq3vxpiAWX0p7zt8YOOOpJe+aMdYjZSiV6U4v1tW0YfqxAONj9Ah7B YqAX6O2CA5MlTmmRoLWnzmgGr9cYzXYSyOjWbV0sOltqEZ7zl+ulo754nRNkH8vNMgKM F/RTdDxkPJ/9Dw3sSl11/Cgyx6GVp6qLCcPQKvhZwdH1QuxwVD2phaWNq5RRvGut85Uc 1sQQ== X-Received: by 10.180.89.104 with SMTP id bn8mr24338891wib.6.1437417351023; Mon, 20 Jul 2015 11:35:51 -0700 (PDT) Received: from bhfedora.localdomain ([82.15.84.251]) by smtp.gmail.com with ESMTPSA id ht9sm10869757wib.18.2015.07.20.11.35.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 11:35:50 -0700 (PDT) From: Brendan Heading To: buildroot@buildroot.org Date: Mon, 20 Jul 2015 19:35:46 +0100 Message-Id: <1437417346-18621-1-git-send-email-brendanheading@gmail.com> X-Mailer: git-send-email 2.4.3 Cc: Brendan Heading Subject: [Buildroot] [PATCH] autobuild - acpid does not build against musl 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes http://autobuild.buildroot.net/results/33e/33ef25e4707a5b81083204e0f064570c11d88af6/ --- package/acpid/0003-fix-TEMP_FAILURE_RETRY.patch | 76 +++++++++++++++++++++++++ package/acpid/0004-fix-warnings.patch | 38 +++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 package/acpid/0003-fix-TEMP_FAILURE_RETRY.patch create mode 100644 package/acpid/0004-fix-warnings.patch diff --git a/package/acpid/0003-fix-TEMP_FAILURE_RETRY.patch b/package/acpid/0003-fix-TEMP_FAILURE_RETRY.patch new file mode 100644 index 0000000..7d81b3c --- /dev/null +++ b/package/acpid/0003-fix-TEMP_FAILURE_RETRY.patch @@ -0,0 +1,76 @@ +Add missing TEMP_FAILURE_RETRY. + +Some external toolchains using strange C libraries (eg MUSL) do not define +this macro. + +Signed-off-by : Brendan Heading + +Index : b/acpid.h +=================================================================== +--- a/acpid.h ++++ b/acpid.h +@@ -39,6 +39,18 @@ + + #define PACKAGE "acpid" + ++/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' ++ set to EINTR. */ ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + /* + * acpid.c + */ +Index : b/kacpimon/libnetlink.h +=================================================================== +--- a/kacpimon/libnetlink.h ++++ b/kacpimon/libnetlink.h +@@ -11,6 +11,18 @@ + #define MSG_CMSG_CLOEXEC 0x40000000 + #endif + ++/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' ++ set to EINTR. */ ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + struct rtnl_handle + { + int fd; +Index : b/libnetlink.h +=================================================================== +--- a/libnetlink.h ++++ b/libnetlink.h +@@ -11,6 +11,18 @@ + #define MSG_CMSG_CLOEXEC 0x40000000 + #endif + ++/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' ++ set to EINTR. */ ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + struct rtnl_handle + { + int fd; diff --git a/package/acpid/0004-fix-warnings.patch b/package/acpid/0004-fix-warnings.patch new file mode 100644 index 0000000..3c6a89d --- /dev/null +++ b/package/acpid/0004-fix-warnings.patch @@ -0,0 +1,38 @@ +diff --git a/acpi_listen.c b/acpi_listen.c +index d0bc175..cc28a43 100644 +--- a/acpi_listen.c ++++ b/acpi_listen.c +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/event.c b/event.c +index 324078f..6dfa57d 100644 +--- a/event.c ++++ b/event.c +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/sock.c b/sock.c +index aaba8cd..eb4a3b4 100644 +--- a/sock.c ++++ b/sock.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include +