From patchwork Tue Sep 1 11:46:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Heading X-Patchwork-Id: 512787 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 15ED714012C for ; Tue, 1 Sep 2015 21:46:20 +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=s+cDmFz8; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3AA6395E40; Tue, 1 Sep 2015 11:46:19 +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 pjzS-m2xJnOT; Tue, 1 Sep 2015 11:46:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1CE9895DC0; Tue, 1 Sep 2015 11:46:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 69D881BFC09 for ; Tue, 1 Sep 2015 11:46:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 65770A396A for ; Tue, 1 Sep 2015 11:46:17 +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 dk82FlsGJ7CC for ; Tue, 1 Sep 2015 11:46:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 974DCA3965 for ; Tue, 1 Sep 2015 11:46:16 +0000 (UTC) Received: by wicjd9 with SMTP id jd9so30052568wic.1 for ; Tue, 01 Sep 2015 04:46:15 -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=r47bV02EQQpXbXPdYzMZJ0suqLLs6QUjtt9xVyTH5rc=; b=s+cDmFz8nLKQLnWbinzHSMnOfgcBwMrtIXD4yvD2skkTXDEGGEdzjNpkHlnaYsS2b8 E0RT7cq0/0dKSosnzMCiqRIDLNJwR/zra9p7VLhVYL89IGQKl5AF1z4pBextZOLtXVrm 7DWjhNRRbf1/qUdKjXN6bgsKUqQIkMYW8y1qhpbbMcYdSQOFomAFzdVE3+3DYxRoBY9x 7IPhuF446XO2Z+Hk3MvR9oSpgZAGzDDJKVejBhoJjZz9I8uUlFtt3fL73ISiqsjt2EX2 qIRdktgqRLjnod4Mw+ctptYiz517zyYG4q5TkHJsZy/NElvMBgZXEGp5Syu3Pw6Xk81e K9Ag== X-Received: by 10.194.173.35 with SMTP id bh3mr28964180wjc.88.1441107975278; Tue, 01 Sep 2015 04:46:15 -0700 (PDT) Received: from bhfedora.localdomain ([82.15.84.251]) by smtp.gmail.com with ESMTPSA id lh3sm9557521wjc.44.2015.09.01.04.46.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Sep 2015 04:46:14 -0700 (PDT) From: Brendan Heading To: buildroot@buildroot.org Date: Tue, 1 Sep 2015 12:46:11 +0100 Message-Id: <1441107971-27210-1-git-send-email-brendanheading@gmail.com> X-Mailer: git-send-email 2.4.3 Cc: Brendan Heading Subject: [Buildroot] [PATCH 1/1] package/dmraid: fix compilation under 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/feb/feb731da1d865b82781366798ffa8aaf40cf2ec4/ http://autobuild.buildroot.net/results/fcf/fcf1ea738da90016900c04313cdcb3a02658e953/ http://autobuild.buildroot.net/results/385/385e07e9097d877cd1babdd4133fbe14a8f217d9/ .. and others. Note, upstream package appears dormant. Signed-off-by: Brendan Heading --- .../dmraid/0001-fix-compilation-under-musl.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/dmraid/0001-fix-compilation-under-musl.patch diff --git a/package/dmraid/0001-fix-compilation-under-musl.patch b/package/dmraid/0001-fix-compilation-under-musl.patch new file mode 100644 index 0000000..7cf8792 --- /dev/null +++ b/package/dmraid/0001-fix-compilation-under-musl.patch @@ -0,0 +1,47 @@ +From 89c7fc15e064dd407e6d5ccefe78985b86b8a036 Mon Sep 17 00:00:00 2001 +From: Brendan Heading +Date: Tue, 1 Sep 2015 12:26:36 +0100 +Subject: [PATCH 1/1] fix compilation under musl + +Patch borrowed from Void Linux : + +https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dmraid/patches/25_musl-libc.patch + +Upstream package appears dormant, no mailing list and no +maintainence releases since Nov 2010. + +Upstream-Status: dormant +Signed-off-by: Brendan Heading + +--- + 1.0.0.rc16-3/dmraid/include/dmraid/misc.h | 1 + + 1.0.0.rc16-3/dmraid/lib/device/scan.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/1.0.0.rc16-3/dmraid/include/dmraid/misc.h b/1.0.0.rc16-3/dmraid/include/dmraid/misc.h +index 247a68e..1b1dfdf 100644 +--- a/1.0.0.rc16-3/dmraid/include/dmraid/misc.h ++++ b/1.0.0.rc16-3/dmraid/include/dmraid/misc.h +@@ -10,6 +10,7 @@ + + #ifndef _MISC_H_ + #define _MISC_H_ ++#include + + #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0); + +diff --git a/1.0.0.rc16-3/dmraid/lib/device/scan.c b/1.0.0.rc16-3/dmraid/lib/device/scan.c +index a040d53..6897146 100644 +--- a/1.0.0.rc16-3/dmraid/lib/device/scan.c ++++ b/1.0.0.rc16-3/dmraid/lib/device/scan.c +@@ -10,6 +10,7 @@ + # include + # include + #else ++# include + # include + # include + #endif +-- +2.4.3 +