From patchwork Mon Jun 27 20:29:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 641235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rdgXK4sMqz9s5J for ; Tue, 28 Jun 2016 06:29:37 +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=dbsotI1e; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 36BD633198; Mon, 27 Jun 2016 20:29:32 +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 7qX0C4WroQTX; Mon, 27 Jun 2016 20:29:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A97D83300B; Mon, 27 Jun 2016 20:29:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0D5FE1CF551 for ; Mon, 27 Jun 2016 20:29:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 087378A274 for ; Mon, 27 Jun 2016 20:29:24 +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 Hs4ECmBH5YZs for ; Mon, 27 Jun 2016 20:29:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id DFAB58A3AA for ; Mon, 27 Jun 2016 20:29:21 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id c82so27784713wme.3 for ; Mon, 27 Jun 2016 13:29:21 -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=SFVC5h2OEaL/nJudHMiWcdweRT/5YXXVBKOCBIZC7Es=; b=dbsotI1eWc5gg0gYmPjvyha3U7R0yQyGx0w/W+g788RazAFbrMPQSruVc45BtPZgnG myIXrUTfuizNrgM/1IEgJUOK2omXdqZu0qJTko5DC9vJlLqhtnTRASMjL1UztV67HG9O lyIL+gf1v+MDjF3D4qVLIIjn1xjIfe0mWr7vQ94yad7STzhJWfSlbroKBT9zrC/MLf3x 8RJwrU4eJ47OW3zoEUQordLvMNw/qpug6T4g118Zrb9DqrcJgpumlQt+L6S5czMsx5yy f8z8AZkSeJ7418E4T7ZGfdw4hzq8HM/mc44dtHqWqrcn/iAlszMmJSVOIlACI7IU50sC atWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SFVC5h2OEaL/nJudHMiWcdweRT/5YXXVBKOCBIZC7Es=; b=A3ZovMwyPWMKgKgsFqB0ycxb/01rwr1EeVstyraIztKhOtdKV1/9cdkWQUbvSJP2sm LraNf2okres3NUKujIYMsPZgo4FZ5L40VSSej6CDe13mH9ALMQPrXVIbpDqDLzjaIK8h CMcgEBq0RsM+7fo/l8S5acO2QdT1B5DxcIE/VddCsx5VThFqMwHJ027SvjoQ/CfHcou8 6p+pAkHdTYVJ16G/lmYDM0L1USx4cC7ftixOm+LIsA2VUViwrnfjIhdXM+DMEiGn5nuT EVzVMzOaPVwqvYFimJUYeYJjBCoFXvrR3iFkGaq+se91UrboxeUsOhhIt7OBeV7f928e +Whw== X-Gm-Message-State: ALyK8tL+AQO22XWbDBOvED48/2Vn6aF4HV73JFMq2m0LBKhausfV3+tA2WrqpURoYiLBxQ== X-Received: by 10.28.125.81 with SMTP id y78mr13019173wmc.5.1467059360337; Mon, 27 Jun 2016 13:29:20 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id hf7sm999483wjc.48.2016.06.27.13.29.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jun 2016 13:29:19 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Mon, 27 Jun 2016 22:29:11 +0200 Message-Id: <1467059351-20171-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] package/mono: fix sigcontext incorrect include 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" This patch solves incorrect inclusion of sigcontext.h on musl. The patch was submitted upstream. Fixes: http://autobuild.buildroot.net/results/bec/beced92f3ef81f201c0dc9178c7ff6fad0bc45e7/ Signed-off-by: Angelo Compagnucci --- ...009-fix-musl-incorrect-sigcontext-include.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/mono/0009-fix-musl-incorrect-sigcontext-include.patch diff --git a/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch b/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch new file mode 100644 index 0000000..3d932b6 --- /dev/null +++ b/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch @@ -0,0 +1,44 @@ +From 63f0b0246b8125ae48b15bd182bb5831be02e6c9 Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Mon, 27 Jun 2016 21:32:11 +0200 +Subject: [PATCH] fix musl incorrect sigcontext include + +On musl __GLIBC__ is not defined, so the conditional logic will +not produce correct result. Add a specific case to handle when +__GLIBC__ is not defined. + +Signed-off-by: Angelo Compagnucci +--- + libgc/os_dep.c | 2 +- + mono/mini/exceptions-arm.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgc/os_dep.c b/libgc/os_dep.c +index 8c8e098..34859c1 100644 +--- a/libgc/os_dep.c ++++ b/libgc/os_dep.c +@@ -32,7 +32,7 @@ + /* prototypes, so we have to include the top-level sigcontext.h to */ + /* make sure the former gets defined to be the latter if appropriate. */ + # include +-# if 2 <= __GLIBC__ ++# if 2 <= __GLIBC__ || !defined(__GLIBC__) + # if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ + /* glibc 2.1 no longer has sigcontext.h. But signal.h */ + /* has the right declaration for glibc 2.1. */ +diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c +index b036aa7..a3e2164 100644 +--- a/mono/mini/exceptions-arm.c ++++ b/mono/mini/exceptions-arm.c +@@ -14,7 +14,7 @@ + #include + + #ifndef MONO_CROSS_COMPILE +-#ifdef HAVE_ASM_SIGCONTEXT_H ++#if defined(HAVE_ASM_SIGCONTEXT_H) && defined(__GLIBC__) + #include + #endif /* def HAVE_ASM_SIGCONTEXT_H */ + #endif +-- +1.9.1 +