From patchwork Fri Nov 20 22:48:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Rebello X-Patchwork-Id: 547069 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 05D14141487 for ; Sat, 21 Nov 2015 09:48:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=qXgEnAyU; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F322A56E4; Fri, 20 Nov 2015 22:48:25 +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 LL7ABCi1kBuh; Fri, 20 Nov 2015 22:48:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8323EA56D8; Fri, 20 Nov 2015 22:48:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1250D1C16B8 for ; Fri, 20 Nov 2015 22:48:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0FA7D959B1 for ; Fri, 20 Nov 2015 22:48:23 +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 4avMRM618krB for ; Fri, 20 Nov 2015 22:48:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f50.google.com (mail-qg0-f50.google.com [209.85.192.50]) by hemlock.osuosl.org (Postfix) with ESMTPS id 268C3959AF for ; Fri, 20 Nov 2015 22:48:22 +0000 (UTC) Received: by qgeb1 with SMTP id b1so83026923qge.1 for ; Fri, 20 Nov 2015 14:48:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=t68QLo6V0OFXqmn+YJmmGHeJZCNmjqoYYsagEXo2KF0=; b=qXgEnAyUJFVGi20wsQ9quLTFlnMA5r9HP40UDyZ1S5bzV4pDMuBXJmxjlvtAy7QGPL GoCDZ6+dVY5aEwvGJSKet1yfHdox41zQ30zu2kKKMBLjjYGOCy3Cb27cQHbKNdvNq65X WNJBKmmnfKRCiP0h0Lzi6oIZZ35gyAQNlBU0HqkxX8wyPVDt+FQPpkCczblbP+5f0JZx XU+9/rNqRD04lkGnMHkT9mXF3b+CQ8GDvBkBbrZeHLsy8zh5Xc+DBou11B9Krul/cnf1 QGk2DXeejzNzp5m3puf4zQxadzikvRvAte2xTVTJGy+VIrTDUWoJYQOrkoD9WiaYJQnK s2cQ== X-Received: by 10.140.105.36 with SMTP id b33mr4793673qgf.94.1448059701343; Fri, 20 Nov 2015 14:48:21 -0800 (PST) Received: from localhost.localdomain ([187.107.24.50]) by smtp.gmail.com with ESMTPSA id d185sm383548qkb.28.2015.11.20.14.48.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Nov 2015 14:48:21 -0800 (PST) From: Rodrigo Rebello To: buildroot@buildroot.org Date: Fri, 20 Nov 2015 20:48:15 -0200 Message-Id: <1448059695-20671-1-git-send-email-rprebello@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [Buildroot] [PATCH v2 1/1] mongrel2: add upstream patch to fix symbol conflict 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" The symbol 'max_align_t', defined in the mongrel2 sources (src/mem/align.h), is also defined in one of the standard headers in some toolchains (the ones based on GCC 5+ apparently). This conflict has been solved upstream, and a new version (1.10.0) containing the fix has been released already, so this backported patch may be dropped in the future when mongrel2 gets a version bump. Fixes: http://autobuild.buildroot.net/results/b7f/b7f86bdda094de96633e9921e0e5895eadc89217/ http://autobuild.buildroot.net/results/f62/f623703aa6d7992b67d305331734e4ed0c7b2be4/ http://autobuild.buildroot.net/results/eb3/eb385cb4f87078122028e85cbe31caa01d794991/ ... Signed-off-by: Rodrigo Rebello --- Changes v1 -> v2: - Fix wording in commit message: s/has been already released/has been released already/ --- .../0004-Rename-symbol-to-prevent-conflict.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch diff --git a/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch b/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch new file mode 100644 index 0000000..8369816 --- /dev/null +++ b/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch @@ -0,0 +1,45 @@ +From 8d0bc79f38913b1a55e7d151b32bbc9462c24b47 Mon Sep 17 00:00:00 2001 +From: Jason Miller +Date: Fri, 14 Aug 2015 19:03:09 -0700 +Subject: [PATCH] Rename symbol to prevent conflict + +One of the standard headers defines max_align_t on some versions of linux. + +[Backported from upstream commit +https://github.com/mongrel2/mongrel2/commit/563bac8c59b9b32205164d237cf1ec0cb48d189f.] + +Signed-off-by: Rodrigo Rebello +--- + src/mem/align.h | 2 +- + src/mem/halloc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mem/align.h b/src/mem/align.h +index 4c6e183..03a4999 100644 +--- a/src/mem/align.h ++++ b/src/mem/align.h +@@ -30,7 +30,7 @@ union max_align + void (*q)(void); + }; + +-typedef union max_align max_align_t; ++typedef union max_align h_max_align_t; + + #endif + +diff --git a/src/mem/halloc.c b/src/mem/halloc.c +index b097d1f..40d0c09 100644 +--- a/src/mem/halloc.c ++++ b/src/mem/halloc.c +@@ -34,7 +34,7 @@ typedef struct hblock + #endif + hlist_item_t siblings; /* 2 pointers */ + hlist_head_t children; /* 1 pointer */ +- max_align_t data[1]; /* not allocated, see below */ ++ h_max_align_t data[1]; /* not allocated, see below */ + + } hblock_t; + +-- +2.1.4 +