From patchwork Tue Jul 12 09:39:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 40629 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 7BADF27BBEA; Tue, 12 Jul 2022 10:59:17 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 B8A4A27BBE9 for ; Tue, 12 Jul 2022 10:59:16 +0100 (BST) Received: from localhost ([::1]:33000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBCfj-0005gg-Ge for patchwork@mira.cbaines.net; Tue, 12 Jul 2022 05:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCN9-0001WU-1T for guix-patches@gnu.org; Tue, 12 Jul 2022 05:40:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBCN8-0004Mp-Nu for guix-patches@gnu.org; Tue, 12 Jul 2022 05:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBCN8-0008Jl-Ly for guix-patches@gnu.org; Tue, 12 Jul 2022 05:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56516] [PATCH] gnu: tcc: Update to a83b28568596afd8792fd58d1a5bd157fc6b6634 Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Jul 2022 09:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56516 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56516@debbugs.gnu.org, guix-devel@gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" , "guix-devel\\@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.165761879631956 (code B ref -1); Tue, 12 Jul 2022 09:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2022 09:39:56 +0000 Received: from localhost ([127.0.0.1]:41663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBCMv-0008JB-5X for submit@debbugs.gnu.org; Tue, 12 Jul 2022 05:39:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:56846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBCMt-0008J4-Kb for submit@debbugs.gnu.org; Tue, 12 Jul 2022 05:39:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCMt-00015w-CL for guix-patches@gnu.org; Tue, 12 Jul 2022 05:39:47 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:34552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBCMn-0004Ku-LA for guix-patches@gnu.org; Tue, 12 Jul 2022 05:39:44 -0400 Date: Tue, 12 Jul 2022 09:39:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail2; t=1657618777; x=1657877977; bh=UgfXnl2XeliDykUWmyQZE2njCs59e6bPVsr5yuT3c8M=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=OczD3ksx+DCSXt81jX5M+oftzdwHyyyZc8mgk5xKw/cJVt8A4FjY07VdF8xAGsISw sFXv6acxWUpe1NzZS1M7dPxd7vQOOw0Gm8VyJgs18NB10aGuKh0Y+olQeFxteM4VSp atzZMik/RgBI5o/jrTW2uUPFCiObJw6aRVHRlHh/vVHVxjKJ5qMo4TRGMjv+7OPQWL ECWBDxXzkAMQgjHIzF/s4HM5EworuXBQrodqPffCpGuj+ImTy2JPPY6A3DbF4SJI/3 oPJ9zr3Lvxh9QUKAGMeWMiaKTwWPYO9o0JZO2n45aQ4M/vaVhDONBkl2bEaEm13KHT lWrxQ86+RSWlw== From: Ekaitz Zarraga Message-ID: Feedback-ID: 3263582:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.17; envelope-from=ekaitz@elenq.tech; helo=mail-4317.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, With this patch the tcc build issue is fixed, the downside is that it's set to an specific commit and not a release. It also separates tcc-boot from the tcc source, so it does not interfere in the bootstrapping process (the patch moves the source of tcc to git and that produces a circular dependency). I hope this is useful. Best, Ekaitz From ed05cfb9356fb5b07be48c54b9ec33eab672de61 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Tue, 12 Jul 2022 11:05:15 +0200 Subject: [PATCH] gnu: tcc: Update to a83b28568596afd8792fd58d1a5bd157fc6b6634 * gnu/packages/c.scm (tcc): Update to a83b28568596afd8792fd58d1a5bd157fc6b6634 * gnu/packages/commencement.scm (tcc-boot)[source]: Remove dependency on tcc. --- gnu/packages/c.scm | 110 ++++++++++++++++++---------------- gnu/packages/commencement.scm | 9 ++- 2 files changed, 66 insertions(+), 53 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index b1f68c706b..c5afc2fc1c 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 (unmatched parenthesis ;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,58 +113,63 @@ (define-public cproc (license license:expat)))) (define-public tcc - (package - (name "tcc") ;aka. "tinycc" - (version "0.9.27") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/tinycc/tcc-" - version ".tar.bz2")) - (sha256 - (base32 - "177bdhwzrnqgyrdv1dwvpd04fcxj68s5pm1dzwny6359ziway8yy")))) - (build-system gnu-build-system) - (native-inputs (list perl texinfo)) - (arguments - `(#:configure-flags (list (string-append "--elfinterp=" - (assoc-ref %build-inputs "libc") - ,(glibc-dynamic-linker)) - (string-append "--crtprefix=" - (assoc-ref %build-inputs "libc") - "/lib") - (string-append "--sysincludepaths=" - (assoc-ref %build-inputs "libc") - "/include:" - (assoc-ref %build-inputs - "kernel-headers") - "/include:{B}/include") - (string-append "--libpaths=" - (assoc-ref %build-inputs "libc") - "/lib") - ,@(if (string-prefix? "armhf-linux" - (or (%current-target-system) - (%current-system))) - `("--triplet=arm-linux-gnueabihf") - '())) - #:test-target "test")) - (native-search-paths - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - ;; Fails to build on MIPS: "Unsupported CPU" - (supported-systems (delete "mips64el-linux" %supported-systems)) - (synopsis "Tiny and fast C compiler") - (description - "TCC, also referred to as \"TinyCC\", is a small and fast C compiler -written in C. It supports ANSI C with GNU and extensions and most of the C99 -standard.") - (home-page "http://www.tinycc.org/") - ;; An attempt to re-licence tcc under the Expat licence is underway but not - ;; (if ever) complete. See the RELICENSING file for more information. - (license license:lgpl2.1+))) + (let ((revision "1") + (commit "a83b28568596afd8792fd58d1a5bd157fc6b6634")) + (package + (name "tcc") ;aka. "tinycc" + (version (git-version "0.9.27" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://repo.or.cz/tinycc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01znw86fg73x3k0clafica4b6glbhz69p588kvp766i0zgvs68dh")))) + (build-system gnu-build-system) + (native-inputs (list perl texinfo)) + (arguments + `(#:configure-flags (list (string-append "--elfinterp=" + (assoc-ref %build-inputs "libc") + ,(glibc-dynamic-linker)) + (string-append "--crtprefix=" + (assoc-ref %build-inputs "libc") + "/lib") + (string-append "--sysincludepaths=" + (assoc-ref %build-inputs "libc") + "/include:" + (assoc-ref %build-inputs + "kernel-headers") + "/include:{B}/include") + (string-append "--libpaths=" + (assoc-ref %build-inputs "libc") + "/lib") + ,@(if (string-prefix? "armhf-linux" + (or (%current-target-system) + (%current-system))) + `("--triplet=arm-linux-gnueabihf") + '())) + #:test-target "test")) + (native-search-paths + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + ;; Fails to build on MIPS: "Unsupported CPU" + (supported-systems (delete "mips64el-linux" %supported-systems)) + (synopsis "Tiny and fast C compiler") + (description + "TCC, also referred to as \"TinyCC\", is a small and fast C compiler + written in C. It supports ANSI C with GNU and extensions and most of the C99 + standard.") + (home-page "http://www.tinycc.org/") + ;; An attempt to re-licence tcc under the Expat licence is underway but not + ;; (if ever) complete. See the RELICENSING file for more information. + (license license:lgpl2.1+)))) (define-public pcc (package diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 820ff7281f..60b06c0901 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2022 Ricardo Wurmus +;;; Copyright © 2022 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -808,7 +809,13 @@ (define tcc-boot (inherit tcc-boot0) (name "tcc-boot") (version "0.9.27") - (source (package-source tcc)) + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/tinycc/tcc-" + version ".tar.bz2")) + (sha256 + (base32 + "177bdhwzrnqgyrdv1dwvpd04fcxj68s5pm1dzwny6359ziway8yy")))) (build-system gnu-build-system) (inputs '()) (propagated-inputs '()) base-commit: 6a6d9a858ef07571089f2f87466641f1374666b0 -- 2.36.1