From patchwork Tue Jul 28 23:45:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Heading X-Patchwork-Id: 501520 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 81884140E40 for ; Wed, 29 Jul 2015 09:46:06 +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=c6iQ+/R5; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BB617958C7; Tue, 28 Jul 2015 23:46:04 +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 7zum-XkSmADf; Tue, 28 Jul 2015 23:46:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 27295958D4; Tue, 28 Jul 2015 23:46:04 +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 A94691C229F for ; Tue, 28 Jul 2015 23:46:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A152EA4134 for ; Tue, 28 Jul 2015 23:46:02 +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 QV_lC1p_2b2y for ; Tue, 28 Jul 2015 23:46:01 +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 81941A4139 for ; Tue, 28 Jul 2015 23:46:01 +0000 (UTC) Received: by wicmv11 with SMTP id mv11so198241773wic.0 for ; Tue, 28 Jul 2015 16:46:00 -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=X3UBAEvJNyFUWEfOy3WqQkQHzD3FiovO0Zcrfn6PbQU=; b=c6iQ+/R5/jR6kkYiU/ujK7JQE1XodN1F3ujQygRN/xxPYfwPgVMUVeHDWRu3JklU2w LdDo2zsUth0k1HvqS1U2C0P+IDQ0OscaeWSS25ZnZgdhrLyZAvQUFch1zGLzjsH4JIxt EvkoN1hVLabzxH7jayagRVUTLCxKOtlTUthDG9YgWK+1mm6S7gn7ECafd/NqzqvO37/7 9JAaDfXLbJi7AARrGej3jNd6Wm++jyRKlID62aEcrLqCFmWZd3ulJYU5eBf2gh6iL4Tw kTxinmPPnx8eRaM34mCW8tU21AAqkned7x5dXE2I75jXGdutMqZ14ai/7vAtHYQe9EYb Ev0w== X-Received: by 10.180.189.196 with SMTP id gk4mr3369962wic.45.1438127160142; Tue, 28 Jul 2015 16:46:00 -0700 (PDT) Received: from bhfedora.localdomain ([82.15.84.251]) by smtp.gmail.com with ESMTPSA id bq7sm35565517wjc.31.2015.07.28.16.45.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2015 16:45:59 -0700 (PDT) From: Brendan Heading To: buildroot@buildroot.org Date: Wed, 29 Jul 2015 00:45:26 +0100 Message-Id: <1438127126-7488-1-git-send-email-brendanheading@gmail.com> X-Mailer: git-send-email 2.4.3 Cc: Brendan Heading Subject: [Buildroot] [PATCH 1/1] package/bdwgc: musl build failure 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/1ed/1edb5e7dab88d3fefca533ab56f7ddc7dd5411d2/ bdwgc attempts to detect older __GLIBC__ versions but does not account for ths case when __GLIBC__ is not defined. Signed-off-by: Brendan Heading --- package/bdwgc/0002-bdwgc-fix-musl-build.patch | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/bdwgc/0002-bdwgc-fix-musl-build.patch diff --git a/package/bdwgc/0002-bdwgc-fix-musl-build.patch b/package/bdwgc/0002-bdwgc-fix-musl-build.patch new file mode 100644 index 0000000..a15d44d --- /dev/null +++ b/package/bdwgc/0002-bdwgc-fix-musl-build.patch @@ -0,0 +1,52 @@ +[PATCH] bdwgc: fix musl build + +This is because musl does not define __GLIBC__. Some logic in os_deps.c +designed to detect and handle old versions of glibc only makes sense +if glibc is in use; this patch therefore checks to ensure __GLIBC__ +is defined first. + +Signed-off-by: Brendan Heading +Upstream-status: submitted + +--- + os_dep.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/os_dep.c b/os_dep.c +index 08c501d..a9a3386 100644 +--- a/os_dep.c ++++ b/os_dep.c +@@ -32,17 +32,19 @@ + /* 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__ && 0 == __GLIBC_MINOR__ +- /* glibc 2.1 no longer has sigcontext.h. But signal.h */ +- /* has the right declaration for glibc 2.1. */ +-# include +-# endif /* 0 == __GLIBC_MINOR__ */ +-# else /* __GLIBC__ < 2 */ +- /* libc5 doesn't have : go directly with the kernel */ +- /* one. Check LINUX_VERSION_CODE to see which we should reference. */ +-# include +-# endif /* __GLIBC__ < 2 */ ++# ifdef __GLIBC__ ++# if 2 <= __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. */ ++# include ++# endif /* 0 == __GLIBC_MINOR__ */ ++# else /* __GLIBC__ < 2 */ ++ /* libc5 doesn't have : go directly with the kernel */ ++ /* one. Check LINUX_VERSION_CODE to see which we should reference. */ ++# include ++# endif /* __GLIBC__ < 2 */ ++# endif /* __GLIBC__ */ + # endif + #endif /* LINUX && !POWERPC */ + +-- +2.4.3 +