From patchwork Sat Feb 29 07:05:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1246994 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hLTQBS9U; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Ty9M0nJTz9sRJ for ; Sat, 29 Feb 2020 18:05:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF09D876E8; Sat, 29 Feb 2020 07:05:35 +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 KSvlw1rnC5Gr; Sat, 29 Feb 2020 07:05:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D760A86356; Sat, 29 Feb 2020 07:05:33 +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 B72541BF332 for ; Sat, 29 Feb 2020 07:05:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B3BE686356 for ; Sat, 29 Feb 2020 07:05:32 +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 ePMUZnjES5M6 for ; Sat, 29 Feb 2020 07:05:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id ED5EE84AAD for ; Sat, 29 Feb 2020 07:05:29 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id x2so4870526ila.9 for ; Fri, 28 Feb 2020 23:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z63uX0xZLMoztZ4rl19+cYkKq5WdOVbjyTgAFdVC+1M=; b=hLTQBS9UTXoXr0iSh/mX5IOLxt6ETV4oAGoeZUzI7i7F747v5eJEHy69e/6qJf7OeQ d6XOfQzPiVUDSSa8cPMiDXjIcumyVBU01Ctvh+533E7IdCkibA8e+t4Xa79815WdYxgL 7By91km7990tSfIx0BMEVXI5Dm6Z2RnM/sfwN7vUQOkEBX6T9ungyPShcI7xUu2Um3AZ l5TQ9WIxmj/Q70gTpGHy1A02m39PVegULqc8IiGiYz2iO/X81VMQ9nU5xlZ7WzurNXyR 7ngHbLuDbntcZOLm6ZIAbMpMjF7xbfAIKede9MWc17NU5frhQYarT+o6NVABqG7aKThI IBIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z63uX0xZLMoztZ4rl19+cYkKq5WdOVbjyTgAFdVC+1M=; b=kuEqf+1YnlCIpVtnatj0SPW+azEMST3GThunAp6IK/909pQAHnWOnFwsZMayNuyikL gMIIWWTiJObr8KDuGPRY23vfewrao5jw6dU+HeCm5n1TaP9gqc8mJEmOVFlO4/inJoDL AvBOjE27KV3XqSeQ0u58iEbLcNzx8/OSFfpTnZTEY4ITdPLlXbMjQ2A8QM9MEk7rO67x DunzGrZ87FmVyY0UToMfintV5wneOt2ineza3VEOHubLQxTcsvb7T1nkqiLOzcOHEMPt EOExM+BHw85bHoLqPeqzgqC3BOaYpxnneReHxwmqBlKMGQF//aRN9/xrx/9hlDubyQHn pcDg== X-Gm-Message-State: APjAAAXbKKF6dYTGM8FlLrRC3NStqM6PUYZPqfErd3jnx94K7u6AmGZq Lgg/sFGrcuSPq7QOXF+5tIwJtvoljA0= X-Google-Smtp-Source: APXvYqzYVASvORlheAiw6Kt0CAaV0PGCRCs+TpQ8LPW+rF5kUukn0YIxonch2GtwI/I/oiHgdoKu0A== X-Received: by 2002:a05:6e02:e06:: with SMTP id a6mr7517843ilk.88.1582959928598; Fri, 28 Feb 2020 23:05:28 -0800 (PST) Received: from james-x399.localdomain (71-33-129-6.hlrn.qwest.net. [71.33.129.6]) by smtp.gmail.com with ESMTPSA id z15sm3906293ill.20.2020.02.28.23.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 23:05:27 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 00:05:06 -0700 Message-Id: <20200229070506.48605-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/guile: bump to version 3.0.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , James Hilliard , Hongxu Jia Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove patch that is no longer needed as of upstream commit 1c33be992e8120abd20add8021e4d91d226f5b6a which removed the old VM. We need to add an exclusion rule for guile modules to check-bin-arch as they appear as valid ELF binaries but with an architecture of "None". Signed-off-by: James Hilliard --- .../0003-workaround-ice-ssa-corruption.patch | 64 ------------------- package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- support/scripts/check-bin-arch | 6 ++ 4 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 package/guile/0003-workaround-ice-ssa-corruption.patch diff --git a/package/guile/0003-workaround-ice-ssa-corruption.patch b/package/guile/0003-workaround-ice-ssa-corruption.patch deleted file mode 100644 index 54f3158a91..0000000000 --- a/package/guile/0003-workaround-ice-ssa-corruption.patch +++ /dev/null @@ -1,64 +0,0 @@ -libguile/vm-i-system.c: workaround ice ssa corruption while compiling with option -g -O - -While compiling with option -g -O, there was a ssa corruption: -.. -Unable to coalesce ssa_names 48 and 3476 which are marked as MUST COALESCE. -sp_48(ab) and sp_3476(ab) -guile-2.0.11/libguile/vm-engine.c: In function 'vm_debug_engine': -guile-2.0.11/libguile/vm.c:673:19: internal compiler error: SSA corruption - #define VM_NAME vm_debug_engine - ^ -guile-2.0.11/libguile/vm-engine.c:39:1: note: in expansion of macro 'VM_NAME' - VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) - ^ -Please submit a full bug report, -with preprocessed source if appropriate. -See for instructions. -... - -Tweak libguile/vm-i-system.c to add boundary value check to workaround it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia - -Fixes Buildroot autobuilder failures on AArch64. - -Signed-off-by: Thomas Petazzoni ---- - libguile/vm-i-system.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c ---- a/libguile/vm-i-system.c -+++ b/libguile/vm-i-system.c -@@ -625,10 +625,22 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6, - /* now shuffle up, from walk to ntotal */ - { - scm_t_ptrdiff nshuf = sp - walk + 1, i; -- sp = (fp - 1) + ntotal + nshuf; -- CHECK_OVERFLOW (); -- for (i = 0; i < nshuf; i++) -- sp[-i] = walk[nshuf-i-1]; -+ /* check the value of nshuf to workaround ice ssa corruption */ -+ /* while compiling with -O -g */ -+ if (nshuf > 0) -+ { -+ sp = (fp - 1) + ntotal + nshuf; -+ CHECK_OVERFLOW (); -+ for (i = 0; i < nshuf; i++) -+ sp[-i] = walk[nshuf-i-1]; -+ } -+ else -+ { -+ sp = (fp - 1) + ntotal + nshuf; -+ CHECK_OVERFLOW (); -+ for (i = 0; i < nshuf; i++) -+ sp[-i] = walk[nshuf-i-1]; -+ } - } - /* and fill optionals & keyword args with SCM_UNDEFINED */ - while (walk <= (fp - 1) + ntotal) --- -1.9.1 - diff --git a/package/guile/guile.hash b/package/guile/guile.hash index 47ac009757..3e6b294cd3 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82 guile-2.0.14.tar.xz +sha256 c9138d6595a9f69bf9733d0bc2d3b9f3d8b79f35f289006912b3361cb0510c75 guile-3.0.0.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index f53ebdd5cb..895cbe95c8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 2.0.14 +GUILE_VERSION = 3.0.0 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch index 3449bd1aeb..ef6f37139f 100755 --- a/support/scripts/check-bin-arch +++ b/support/scripts/check-bin-arch @@ -79,6 +79,12 @@ while read f; do continue fi + # If architecture is "None" and file extension is ".go", assume + # it is a guile module + if test "${arch}" = "None" -a "${f: -3}" = ".go" ; then + continue + fi + # Architecture is correct if test "${arch}" = "${arch_name}" ; then continue