From patchwork Wed Jul 29 18:50:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Heading X-Patchwork-Id: 501793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C800E14030C for ; Thu, 30 Jul 2015 04:50:24 +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=cmGmA1lJ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A647892169; Wed, 29 Jul 2015 18:50:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9ogepYp9FaPK; Wed, 29 Jul 2015 18:50:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 26A6092161; Wed, 29 Jul 2015 18:50:22 +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 57F231C221B for ; Wed, 29 Jul 2015 18:50:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5402DA4570 for ; Wed, 29 Jul 2015 18:50:21 +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 5nws2g56DDgZ for ; Wed, 29 Jul 2015 18:50:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5BFFFA456C for ; Wed, 29 Jul 2015 18:50:20 +0000 (UTC) Received: by wicmv11 with SMTP id mv11so230523560wic.0 for ; Wed, 29 Jul 2015 11:50:19 -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=TiJBQZJuVBvux3egYVLxWUBsZEvw1Pp2XfYntd9LFNs=; b=cmGmA1lJ7HjQoko/aidXUdT6LpyJP5/dFVzIGsxSg5Kll8ZlOzIu0oubP5UZndcK4T g9nrNENhDF9ct2Ho/6Xu8Yb6bmEWPYPfMSHQk5vnPiRo8e++0ckWlUm2pb1Uf2BiEA5k P9IqvKpgauXpd2aLPfEIOPpw+1gUcdAlMu3dN5Ye44aWyoULrdnzfrQz61NETxyN+c0o 5Vf+UFxDT0payCEiNMrQF1lib1daYL6eN0ZFa2Ai8M3h7PC3NWmeIfTnwUEQkzujVtGo va02uLm/X+6p40qTT87adVsb5Na4hAgyHdKgNptHs8G/Xukfn2Vy4m1qv9BQhQ4QW3iW /9Kw== X-Received: by 10.194.97.196 with SMTP id ec4mr79866651wjb.3.1438195818930; Wed, 29 Jul 2015 11:50:18 -0700 (PDT) Received: from bhfedora.localdomain ([82.15.84.251]) by smtp.gmail.com with ESMTPSA id fq15sm1987943wjc.12.2015.07.29.11.50.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 11:50:18 -0700 (PDT) From: Brendan Heading To: buildroot@buildroot.org Date: Wed, 29 Jul 2015 19:50:15 +0100 Message-Id: <1438195815-29424-1-git-send-email-brendanheading@gmail.com> X-Mailer: git-send-email 2.4.3 Cc: Brendan Heading Subject: [Buildroot] [PATCH 1/1] packages/btrfs-progs: fix build issues 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/b97/b97f1e9cd459da96e3e1680bb7c43d8103ab12c2/ Caused by assumptions around __GLIBC__ and header inclusion. Signed-off-by: Brendan Heading --- ...s-compilation-errors-when-using-musl-libc.patch | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 package/btrfs-progs/0001-btrfs-progs-compilation-errors-when-using-musl-libc.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-compilation-errors-when-using-musl-libc.patch b/package/btrfs-progs/0001-btrfs-progs-compilation-errors-when-using-musl-libc.patch new file mode 100644 index 0000000..dde1851 --- /dev/null +++ b/package/btrfs-progs/0001-btrfs-progs-compilation-errors-when-using-musl-libc.patch @@ -0,0 +1,91 @@ +From 8905b451014fce570984335f153f3977e94f0115 Mon Sep 17 00:00:00 2001 +From: Brendan Heading +Date: Wed, 29 Jul 2015 19:27:26 +0100 +Subject: [PATCH 1/1] btrfs-progs: compilation errors when using musl libc + +- limits.h must be included to pick up PATH_MAX. +- remove double declaration of BTRFS_DISABLE_BACKTRACE + +kerncompat.h assumed that if __GLIBC__ was not defined, +it could safely define BTRFS_DISABLE_BACKTRACE, however this can be +defined by the configure script. Added a check to ensure it is not +defined first. + +Upstream-status: submitted + +See : http://thread.gmane.org/gmane.comp.file-systems.btrfs/46771 + +Signed-off-by: Brendan Heading +--- + cmds-inspect.c | 1 + + cmds-receive.c | 1 + + cmds-scrub.c | 1 + + cmds-send.c | 1 + + kerncompat.h | 2 ++ + 5 files changed, 6 insertions(+) + +diff --git a/cmds-inspect.c b/cmds-inspect.c +index 71451fe..9712581 100644 +--- a/cmds-inspect.c ++++ b/cmds-inspect.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "kerncompat.h" + #include "ioctl.h" +diff --git a/cmds-receive.c b/cmds-receive.c +index 071bea9..d4b3103 100644 +--- a/cmds-receive.c ++++ b/cmds-receive.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/cmds-scrub.c b/cmds-scrub.c +index b7aa809..5a85dc4 100644 +--- a/cmds-scrub.c ++++ b/cmds-scrub.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include "ctree.h" + #include "ioctl.h" +diff --git a/cmds-send.c b/cmds-send.c +index 20bba18..a0b7f95 100644 +--- a/cmds-send.c ++++ b/cmds-send.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "ctree.h" + #include "ioctl.h" +diff --git a/kerncompat.h b/kerncompat.h +index 5d92856..7c627ba 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -33,7 +33,9 @@ + #include + + #ifndef __GLIBC__ ++#ifndef BTRFS_DISABLE_BACKTRACE + #define BTRFS_DISABLE_BACKTRACE ++#endif + #define __always_inline __inline __attribute__ ((__always_inline__)) + #endif + +-- +2.4.3 +