From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SKotK+Kt8mKswgAAbAwnHQ (envelope-from ) for ; Tue, 09 Aug 2022 20:56:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6FlDKuKt8mIXMQAAG6o9tA (envelope-from ) for ; Tue, 09 Aug 2022 20:56:34 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4BC1D202A1 for ; Tue, 9 Aug 2022 20:56:34 +0200 (CEST) Received: from localhost ([::1]:56402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUP3-0005Wb-C8 for larch@yhetil.org; Tue, 09 Aug 2022 14:56:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKg-0000ow-NP for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKg-00025c-BZ for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKg-0003Tb-8Z for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 1/6] gnu: Parameterize libgccjit. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111113314 (code B ref 57086); Tue, 09 Aug 2022 18:52:02 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:51 +0000 Received: from localhost ([127.0.0.1]:45003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKU-0003Sf-RW for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:51 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKP-0003Rv-KM for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:48 -0400 Received: by mail-ej1-f68.google.com with SMTP id gb36so23751493ejc.10 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=XzSdnoGDviNl3uJmf3Mz2oEVlIzkTR2qaseS560II9Q=; b=qE6KZ1vNeTNQSDZ5cXkMP8LMBOgIuJ76SWnHghrFkIB9EtKRdacWkj3sWBlhJOVktm 1xHx0n8O4oC/QKjFR4sQDViLI6ZqV65dzkT6NVoJ21uElZwkqROHIZakFxH6IgMblPz4 RvY6DEZP3CTtZUNhIbtNREMtADk4b9JPfeMeJV0ihNyvz3Fb6oGzGazLkqD71HlRTJXq 4R7Z1dgeYoO+WoYyCZIDB2In9N7mxig9PLhxctASr8r+UQzOfJFZ9HdUvyHhhngU0ivG xH7TEpFS7uRVfzNSeoslk9Cpt8XS57tUXlVtevJ6wUfuYj27Fz9bRXf3aPHTRBwLG2+8 7SNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=XzSdnoGDviNl3uJmf3Mz2oEVlIzkTR2qaseS560II9Q=; b=Ri6QrdtQQWmc1s1opsShBRKLNWgRb/CJTe0sOff5sGdA8oGQ55mfvgqZU/Hzd5ipMf MbkikiVw7GWtE+8u08etwhOjZkqNqvoACyha7iQfuozPyF5rjpjfKqPIZ+T3ACDfcAl2 dhlzxO1eee+KWhZ/FyHQSq2uAWlCDhChGnicWfJWOJVgPYO9AyYh0ytNMqNvd+FzEr9V 1tGSonfMrN4hw8z3OBGTt/UTmdEmk3Km37QKBglIN8IZ54J/1nuhxLCjBiYyVqaaOsnm 8us36VTosYCSEZk+8XlXFUivFjuw4rUwBHI7MMohXNW78vXTZdVo37GIpUH6odvNhwLf wbQA== X-Gm-Message-State: ACgBeo30vPeWQ0m1BKpSI13TgKfyRNmGmlQqGAlgpfpx7wOyLnZHt2Xv tAM6db19k6qrod8PssVkrY/RjgBGR+Y= X-Google-Smtp-Source: AA6agR7GuGaOZa9adhDLepGSRoATxfF2axvf4FUVP1SVNELDQScDLpGYOrd3nC3LxP6TokbLV6KU3Q== X-Received: by 2002:a17:906:4fc4:b0:6da:b4c6:fadb with SMTP id i4-20020a1709064fc400b006dab4c6fadbmr18325246ejw.282.1660071099600; Tue, 09 Aug 2022 11:51:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.39 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:39 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 5 Aug 2022 05:29:58 +0200 Content-Transfer-Encoding: 7bit Message-ID: <77ce1e3ecbd6b616cda3d0265401d890420e9fac.camel@gmail.com> 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660071394; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XzSdnoGDviNl3uJmf3Mz2oEVlIzkTR2qaseS560II9Q=; b=nueNPhlQFcr+jsp9p1vakeU2nAb9VkO51mCkxdlS+DiDZW/7/wGqmxT1xi1lctEa3d8DBW hok7Pty64YH6Zkjr2LxL1wvHeG8gnRrdmory8vZLzwgFmHAjsdiE1WBy7LeE6k12CQKsrJ o2jaMERIDOumwhplcPLq7v21+2YHPnUcAAloqpTsJfChehb2w7nzqgceafmtijxwis+Gxp KorcY9pQuAcAtnI/Oi2vc6Tw41qQGurHFj0MvfIvWtxQmZfvy5H/M3zZM3rS55fY27UTAR hSDOIb1b3vOECc1BBl2FuI8iakEqWQPNcluRlU62RPb3WC+x4JSQKyoH0Ajdvw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660071394; a=rsa-sha256; cv=none; b=YsSaN6DmiFJn6CAvLpPjl3kjL5esbD3I5wgdXSaxGD/05LN7IDmIyEBYF+HyLsfnWcMPRX rboy6anwyXMGwsFgZ1irDB1myEEDcl8cZ5dyi1NrMyxf5R+jNeUkSBiBU4h4o58XMVrl0C vE5jhd2ou8bhKMepP9GsZJ9ENI9zwyH5fVDQczUZbG6HUP6E52J/fdNepmGHsII1zC+Xjl FxfG0stPl2iqRmcC9/d3Tx/KYrQUo8o0/ni4npsu4D7tU4ajtoeWBKkIuQ09yzUmbxlw7G ubI0nYGacWWRFi42Kpu6+UX33gxx/KA7moz0kvkL/2FxCuwvcuIMeJgddTX7Xg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=qE6KZ1vN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=qE6KZ1vN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4BC1D202A1 X-Spam-Score: 5.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: UF+c74OyF0yv * gnu/packages/gcc.scm (make-libgccjit): New variable. (libgccjit): Define in terms of make-libgccjit. --- gnu/packages/gcc.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4c496e31b2..66f0766646 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -968,31 +968,33 @@ (define-public gdc-11 (custom-gcc gcc-11 "gdc" '("d") %generic-search-paths))) -(define-public libgccjit +(define-public (make-libgccjit gcc) (package - (inherit gcc-9) + (inherit gcc) (name "libgccjit") (outputs (delete "lib" (package-outputs gcc))) (properties (alist-delete 'hidden? (package-properties gcc))) (arguments - (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 regex) - (srfi srfi-1) - (srfi srfi-26)) - ,@(package-arguments gcc)) + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules _ '()) + '((guix build gnu-build-system) + (guix build utils) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26))) ((#:configure-flags flags) - `(append `("--enable-host-shared" - ,(string-append "--enable-languages=jit")) + #~(cons* "--enable-host-shared" + "--enable-languages=jit" (remove (cut string-match "--enable-languages.*" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) + #~(modify-phases #$phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files + (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) (synopsis "GCC library generating machine code on-the-fly at runtime") (description "This package is part of the GNU Compiler Collection and provides an @@ -1003,6 +1005,8 @@ (define-public libgccjit compilers. The just-in-time (jit) part of the name is now something of a misnomer."))) +(define-public libgccjit (make-libgccjit gcc-9)) + (define (make-gccgo gcc) "Return a gccgo package based on GCC." (let ((gccgo (custom-gcc gcc "gccgo" '("go") %generic-search-paths))) -- 2.37.0