From patchwork Mon May 2 18:24:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39067 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67E0E27BBE9; Mon, 2 May 2022 19:25:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F3DD27BBEA for ; Mon, 2 May 2022 19:25:22 +0100 (BST) Received: from localhost ([::1]:46798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajZ-00053T-Jo for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051O-Ul for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajI-000166-JV for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajI-0003G0-GT for guix-patches@gnu.org; Mon, 02 May 2022 14:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 5/8] commencement: tcc-boot0: Update to 0.9.26-1136-g0fbeb2dd. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589712452 (code B ref 55227); Mon, 02 May 2022 18:25:04 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:57 +0000 Received: from localhost ([127.0.0.1]:37984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlajA-0003Ef-QH for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaix-0003Cy-Fo for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlais-0000sr-97; Mon, 02 May 2022 14:24:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=PdCJNvzTnPXpDd7Xrdnxj8gKl18o2JjEfPug3Icz+yw=; b=rdOw43jEhc3vDK8EOdyO koAXduFCubXg54TG/ihqg5YexOUathJaY95OGwcJF9NK6VNHe2PgjgHaP4Y0/dXEMb/jVZhBW3fGg VcH/Jv1msSf8rb1gfuZFfZ5aHL1Fkf2h0fh8n3HnGb15M78O/9duMlm61wB0iC7bkU8HxGHyV2hSY apUhCHf0fe6PyXv6SPcFK3dgCtqzjD1syfFJG7KPNnXAza0FO5krUGgVXgk0cYEilz7AXOCMIYGrP 21XW2Nnpn0pT4U0C0IGM7tta66HZ1RYClxRnkk3uWVThwTwfoTL8OuBRybHQCS7VgtiyZ4ux168r1 YqpWIXUfBCjVoQ==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlair-0006Dq-TO; Mon, 02 May 2022 14:24:38 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:31 +0200 Message-Id: <20220502182434.32130-5-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (tcc-boot0)[source]: Update to 0.9.26-1136-g0fbeb2dd. [native-inputs]: Add stage0-posix and mes-boot, remove %bootstrap-mescc-tools and %bootstrap-mes-rewired. --- gnu/packages/commencement.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7f1ba7aa6a..8b8b243754 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -608,7 +608,7 @@ (define (objects-in-dir dir) (define tcc-boot0 - ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 + ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 30 ;; patches. In a very early and rough form they were presented to the ;; TinyCC developers, who at the time showed no interest in supporting the ;; bootstrappable effort; we will try again later. These patches have been @@ -617,26 +617,26 @@ (define tcc-boot0 (package (inherit tcc) (name "tcc-boot0") - (version "0.9.26-1103-g6e62e0e") + (version "0.9.26-1136-g5bba73cc") (source (bootstrap-origin (origin (method url-fetch) (uri (string-append - "https://lilypond.org/janneke/mes/20191117/" + "https://lilypond.org/janneke/tcc/" "/tcc-" version ".tar.gz")) (sha256 (base32 - "1qbybw7mxbgkv3sazvz1v7c8byq998vk8f1h25ik8w3d2l63lxng"))))) + "1y2f04qwdqg7dgxiscbf0ibybx2gclniwbbcsxpayazzii2cvji3"))))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) + ("mescc-tools" ,stage0-posix) ("nyacc-source" ,(bootstrap-origin (origin (inherit (package-source nyacc-1.00.2)) (snippet #f)))) - ("mescc-tools" ,%bootstrap-mescc-tools) ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f @@ -651,18 +651,17 @@ (define tcc-boot0 (with-directory-excursion ".." (invoke "tar" "-xvf" nyacc-source))))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) (dir (with-directory-excursion ".." (getcwd))) - (interpreter "/lib/mes-loader")) - - (setenv "prefix" out) - (setenv "GUILE_LOAD_PATH" - (string-append dir "/nyacc-0.99.0/module")) - + (interpreter "/lib/mes-loader") + (mes (assoc-ref inputs "mes")) + (mescc (string-append mes "/bin/mescc"))) (substitute* "conftest.c" (("volatile") "")) - + (setenv "prefix" out) + (setenv "GUILE_LOAD_PATH" + (string-append dir "/nyacc-1.00.2/module")) (invoke "sh" "configure" "--cc=mescc" (string-append "--prefix=" out) @@ -672,7 +671,7 @@ (define tcc-boot0 (replace 'build (lambda _ (substitute* "bootstrap.sh" ; Show some progress - (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) + (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{program_prefix[}]tcc) [^\"]*[^\\])\n" all space cmd) (string-append space "echo \"" cmd "\"\n" space cmd "\n"))) (invoke "sh" "bootstrap.sh"))) @@ -892,8 +891,8 @@ (define tcc-boot (string-append out "/include")) (copy-recursively (string-append tcc "/lib") (string-append out "/lib")) - (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") - (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (invoke "./tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "./tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) (delete-file (string-append out "/lib/tcc/libtcc1.a")) (copy-file "libtcc1.a"